Skip to content

Commit 69be312

Browse files
author
Wayne Davison
committed
Some minor variable and flag cleanup.
1 parent 4b4bcbe commit 69be312

File tree

5 files changed

+9
-13
lines changed

5 files changed

+9
-13
lines changed

flist.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,9 @@ extern int preserve_devices;
5252
extern int preserve_specials;
5353
extern int delete_during;
5454
extern int missing_args;
55-
extern int uid_ndx;
56-
extern int gid_ndx;
5755
extern int eol_nulls;
5856
extern int relative_paths;
5957
extern int implied_dirs;
60-
extern int file_extra_cnt;
6158
extern int ignore_perishable;
6259
extern int non_perishable_cnt;
6360
extern int prune_empty_dirs;
@@ -3177,13 +3174,14 @@ char *f_name(const struct file_struct *f, char *fbuf)
31773174
* of the dirname string, and also indicates that "dirname" is a MAXPATHLEN
31783175
* buffer (the functions we call will append names onto the end, but the old
31793176
* dir value will be restored on exit). */
3180-
struct file_list *get_dirlist(char *dirname, int dlen, int ignore_filter_rules)
3177+
struct file_list *get_dirlist(char *dirname, int dlen, int flags)
31813178
{
31823179
struct file_list *dirlist;
31833180
char dirbuf[MAXPATHLEN];
31843181
int save_recurse = recurse;
31853182
int save_xfer_dirs = xfer_dirs;
31863183
int save_prune_empty_dirs = prune_empty_dirs;
3184+
int senddir_fd = flags & GDL_IGNORE_FILTER_RULES ? -2 : -1;
31873185

31883186
if (dlen < 0) {
31893187
dlen = strlcpy(dirbuf, dirname, MAXPATHLEN);
@@ -3196,7 +3194,7 @@ struct file_list *get_dirlist(char *dirname, int dlen, int ignore_filter_rules)
31963194

31973195
recurse = 0;
31983196
xfer_dirs = 1;
3199-
send_directory(ignore_filter_rules ? -2 : -1, dirlist, dirname, dlen, FLAG_CONTENT_DIR);
3197+
send_directory(senddir_fd, dirlist, dirname, dlen, FLAG_CONTENT_DIR);
32003198
xfer_dirs = save_xfer_dirs;
32013199
recurse = save_recurse;
32023200
if (INFO_GTE(PROGRESS, 1))

generator.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ extern int preserve_hard_links;
4444
extern int preserve_executability;
4545
extern int preserve_perms;
4646
extern int preserve_times;
47-
extern int uid_ndx;
48-
extern int gid_ndx;
4947
extern int delete_mode;
5048
extern int delete_before;
5149
extern int delete_during;
@@ -1233,7 +1231,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
12331231

12341232
if (need_fuzzy_dirlist && S_ISREG(file->mode)) {
12351233
strlcpy(fnamecmpbuf, dn, sizeof fnamecmpbuf);
1236-
fuzzy_dirlist = get_dirlist(fnamecmpbuf, -1, 1);
1234+
fuzzy_dirlist = get_dirlist(fnamecmpbuf, -1, GDL_IGNORE_FILTER_RULES);
12371235
need_fuzzy_dirlist = 0;
12381236
}
12391237

log.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ extern int protocol_version;
3737
extern int always_checksum;
3838
extern int preserve_times;
3939
extern int msgs2stderr;
40-
extern int uid_ndx;
41-
extern int gid_ndx;
4240
extern int stdout_format_has_i;
4341
extern int stdout_format_has_o_or_i;
4442
extern int logfile_format_has_i;

rsync.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ extern int am_generator;
4141
extern int am_starting_up;
4242
extern int allow_8bit_chars;
4343
extern int protocol_version;
44-
extern int uid_ndx;
45-
extern int gid_ndx;
4644
extern int inc_recurse;
4745
extern int inplace;
4846
extern int flist_eof;

rsync.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,12 @@
8585

8686
/* These flags are passed to functions but not stored. */
8787

88-
#define FLAG_DIVERT_DIRS (1<<16)/* sender */
88+
#define FLAG_DIVERT_DIRS (1<<16) /* sender, but must be unique */
8989

90+
/* These flags are for get_dirlist(). */
91+
#define GDL_IGNORE_FILTER_RULES (1<<0)
92+
93+
/* Some helper macros for matching bits. */
9094
#define BITS_SET(val,bits) (((val) & (bits)) == (bits))
9195
#define BITS_SETnUNSET(val,onbits,offbits) (((val) & ((onbits)|(offbits))) == (onbits))
9296
#define BITS_EQUAL(b1,b2,mask) (((unsigned)(b1) & (unsigned)(mask)) \

0 commit comments

Comments
 (0)