X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/91c4da3fda9862fa95d4aaea0a328a827e93073b..6a7cc46cb279b9dbf12977177330aeebb912aa34:/flist.c diff --git a/flist.c b/flist.c index cd5aa149..8bc3ab37 100644 --- a/flist.c +++ b/flist.c @@ -57,14 +57,16 @@ extern int relative_paths; extern int implied_dirs; extern int copy_links; extern int copy_unsafe_links; -extern int remote_version; +extern int protocol_version; extern int io_error; extern int sanitize_paths; extern int read_batch; extern int write_batch; -static struct exclude_struct **local_exclude_list; +extern struct exclude_struct **exclude_list; +extern struct exclude_struct **server_exclude_list; +extern struct exclude_struct **local_exclude_list; static struct file_struct null_file; @@ -250,20 +252,37 @@ int link_stat(const char *path, STRUCT_STAT * buffer) } /* - This function is used to check if a file should be included/excluded - from the list of files based on its name and type etc + * This function is used to check if a file should be included/excluded + * from the list of files based on its name and type etc. The value of + * exclude_level is set to either SERVER_EXCLUDES or ALL_EXCLUDES. */ -static int check_exclude_file(int f, char *fname, STRUCT_STAT * st) +static int check_exclude_file(char *fname, int is_dir, int exclude_level) { - extern int delete_excluded; - - /* f is set to -1 when calculating deletion file list */ - if ((f == -1) && delete_excluded) { +#if 0 /* This currently never happens, so avoid a useless compare. */ + if (exclude_level == NO_EXCLUDES) return 0; +#endif + if (fname) { + /* never exclude '.', even if somebody does --exclude '*' */ + if (fname[0] == '.' && !fname[1]) + return 0; + /* Handle the -R version of the '.' dir. */ + if (fname[0] == '/') { + int len = strlen(fname); + if (fname[len-1] == '.' && fname[len-2] == '/') + return 0; + } } - if (check_exclude(fname, local_exclude_list, st)) { + if (server_exclude_list + && check_exclude(server_exclude_list, fname, is_dir)) + return 1; + if (exclude_level != ALL_EXCLUDES) + return 0; + if (exclude_list && check_exclude(exclude_list, fname, is_dir)) + return 1; + if (local_exclude_list + && check_exclude(local_exclude_list, fname, is_dir)) return 1; - } return 0; } @@ -427,7 +446,7 @@ static void send_file_entry(struct file_struct *file, int f, #if SUPPORT_HARD_LINKS if (preserve_hard_links && S_ISREG(file->mode)) { - if (remote_version < 26) { + if (protocol_version < 26) { /* 32-bit dev_t and ino_t */ write_int(f, (int) file->dev); write_int(f, (int) file->inode); @@ -440,7 +459,7 @@ static void send_file_entry(struct file_struct *file, int f, #endif if (always_checksum) { - if (remote_version < 21) { + if (protocol_version < 21) { write_buf(f, file->sum, 2); } else { write_buf(f, file->sum, MD4_SUM_LENGTH); @@ -560,7 +579,7 @@ static void receive_file_entry(struct file_struct **fptr, } #if SUPPORT_HARD_LINKS if (preserve_hard_links && S_ISREG(file->mode)) { - if (remote_version < 26) { + if (protocol_version < 26) { file->dev = read_int(f); file->inode = read_int(f); } else { @@ -574,7 +593,7 @@ static void receive_file_entry(struct file_struct **fptr, file->sum = (char *) malloc(MD4_SUM_LENGTH); if (!file->sum) out_of_memory("md4 sum"); - if (remote_version < 21) { + if (protocol_version < 21) { read_buf(f, file->sum, 2); } else { read_buf(f, file->sum, MD4_SUM_LENGTH); @@ -641,8 +660,8 @@ static int skip_filesystem(char *fname, STRUCT_STAT * st) * statting directories if we're not recursing, but this is not a very * important case. Some systems may not have d_type. **/ -struct file_struct *make_file(int f, char *fname, struct string_area **ap, - int noexcludes) +struct file_struct *make_file(char *fname, struct string_area **ap, + int exclude_level) { struct file_struct *file; STRUCT_STAT st; @@ -664,24 +683,23 @@ struct file_struct *make_file(int f, char *fname, struct string_area **ap, if (readlink_stat(fname, &st, linkbuf) != 0) { int save_errno = errno; - if ((errno == ENOENT) && !noexcludes) { + if (errno == ENOENT && exclude_level != NO_EXCLUDES) { /* either symlink pointing nowhere or file that * was removed during rsync run; see if excluded * before reporting an error */ - memset((char *) &st, 0, sizeof(st)); - if (check_exclude_file(f, fname, &st)) { + if (check_exclude_file(fname, 0, exclude_level)) { /* file is excluded anyway, ignore silently */ return NULL; } } io_error = 1; - rprintf(FERROR, "readlink %s: %s\n", - fname, strerror(save_errno)); + rprintf(FERROR, "readlink %s failed: %s\n", + full_fname(fname), strerror(save_errno)); return NULL; } - /* we use noexcludes from backup.c */ - if (noexcludes) + /* backup.c calls us with exclude_level set to NO_EXCLUDES. */ + if (exclude_level == NO_EXCLUDES) goto skip_excludes; if (S_ISDIR(st.st_mode) && !recurse && !files_from) { @@ -694,17 +712,16 @@ struct file_struct *make_file(int f, char *fname, struct string_area **ap, return NULL; } - if (check_exclude_file(f, fname, &st)) + if (check_exclude_file(fname, S_ISDIR(st.st_mode) != 0, exclude_level)) return NULL; - if (lp_ignore_nonreadable(module_id) && access(fname, R_OK) != 0) return NULL; skip_excludes: if (verbose > 2) - rprintf(FINFO, "make_file(%d,%s)\n", f, fname); + rprintf(FINFO, "make_file(%s,*,%d)\n", fname, exclude_level); file = (struct file_struct *) malloc(sizeof(*file)); if (!file) @@ -782,8 +799,12 @@ void send_file_name(int f, struct file_list *flist, char *fname, int recursive, unsigned base_flags) { struct file_struct *file; + extern int delete_excluded; - file = make_file(f, fname, &flist->string_area, 0); + /* f is set to -1 when calculating deletion file list */ + file = make_file(fname, &flist->string_area, + f == -1 && delete_excluded? SERVER_EXCLUDES + : ALL_EXCLUDES); if (!file) return; @@ -795,7 +816,7 @@ void send_file_name(int f, struct file_list *flist, char *fname, if (write_batch) /* dw */ file->flags = FLAG_DELETE; - if (strcmp(file->basename, "")) { + if (file->basename[0]) { flist->files[flist->count++] = file; send_file_entry(file, f, base_flags); } @@ -822,7 +843,8 @@ static void send_directory(int f, struct file_list *flist, char *dir) d = opendir(dir); if (!d) { io_error = 1; - rprintf(FERROR, "opendir(%s): %s\n", dir, strerror(errno)); + rprintf(FERROR, "opendir %s failed: %s\n", + full_fname(dir), strerror(errno)); return; } @@ -831,9 +853,8 @@ static void send_directory(int f, struct file_list *flist, char *dir) if (fname[l - 1] != '/') { if (l == MAXPATHLEN - 1) { io_error = 1; - rprintf(FERROR, - "skipping long-named directory %s\n", - fname); + rprintf(FERROR, "skipping long-named directory: %s\n", + full_fname(fname)); closedir(d); return; } @@ -847,36 +868,41 @@ static void send_directory(int f, struct file_list *flist, char *dir) if (cvs_exclude) { if (strlen(fname) + strlen(".cvsignore") <= MAXPATHLEN - 1) { strcpy(p, ".cvsignore"); - local_exclude_list = - make_exclude_list(fname, NULL, 0, 0); + add_exclude_file(&exclude_list,fname,MISSING_OK,ADD_EXCLUDE); } else { io_error = 1; rprintf(FINFO, "cannot cvs-exclude in long-named directory %s\n", - fname); + full_fname(fname)); } } - for (di = readdir(d); di; di = readdir(d)) { + for (errno = 0, di = readdir(d); di; errno = 0, di = readdir(d)) { char *dname = d_name(di); - if (strcmp(dname, ".") == 0 || strcmp(dname, "..") == 0) + if (dname[0] == '.' && (dname[1] == '\0' + || (dname[1] == '.' && dname[2] == '\0'))) continue; strlcpy(p, dname, MAXPATHLEN - l); send_file_name(f, flist, fname, recurse, 0); } - - if (local_exclude_list) { - add_exclude_list("!", &local_exclude_list, 0); + if (errno) { + io_error = 1; + rprintf(FERROR, "readdir(%s): (%d) %s\n", + dir, errno, strerror(errno)); } + if (local_exclude_list) + free_exclude_list(&local_exclude_list); /* Zeros pointer too */ + closedir(d); } /** - * - * I think f==-1 means that the list should just be built in - * memory and not transmitted. But who can tell? -- mbp + * The delete_files() function in receiver.c sets f to -1 so that we just + * construct the file list in memory without sending it over the wire. It + * also has the side-effect of ignoring user-excludes if delete_excluded + * is set (so that the delete list includes user-excluded files). **/ struct file_list *send_file_list(int f, int argc, char *argv[]) { @@ -899,8 +925,8 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) io_start_buffering(f); if (filesfrom_fd >= 0) { if (argv[0] && !push_dir(argv[0], 0)) { - rprintf(FERROR, "push_dir %s : %s\n", - argv[0], strerror(errno)); + rprintf(FERROR, "push_dir %s failed: %s\n", + full_fname(argv[0]), strerror(errno)); exit_cleanup(RERR_FILESELECT); } use_ff_fd = 1; @@ -924,14 +950,10 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) } l = strlen(fname); - if (l != 1 && fname[l - 1] == '/') { - if ((l == 2) && (fname[0] == '.')) { - /* Turn ./ into just . rather than ./. - This was put in to avoid a problem with - rsync -aR --delete from ./ - The send_file_name() below of ./ was - mysteriously preventing deletes */ - fname[1] = 0; + if (fname[l - 1] == '/') { + if (l == 2 && fname[0] == '.') { + /* Turn "./" into just "." rather than "./." */ + fname[1] = '\0'; } else { strlcat(fname, ".", MAXPATHLEN); } @@ -940,8 +962,8 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) if (link_stat(fname, &st) != 0) { if (f != -1) { io_error = 1; - rprintf(FERROR, "link_stat %s : %s\n", - fname, strerror(errno)); + rprintf(FERROR, "link_stat %s failed: %s\n", + full_fname(fname), strerror(errno)); } continue; } @@ -1007,8 +1029,8 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) if (!olddir) { io_error = 1; - rprintf(FERROR, "push_dir %s : %s\n", - dir, strerror(errno)); + rprintf(FERROR, "push_dir %s failed: %s\n", + full_fname(dir), strerror(errno)); continue; } @@ -1023,8 +1045,8 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) if (olddir != NULL) { flist_dir = NULL; if (pop_dir(olddir) != 0) { - rprintf(FERROR, "pop_dir %s : %s\n", - dir, strerror(errno)); + rprintf(FERROR, "pop_dir %s failed: %s\n", + full_fname(dir), strerror(errno)); exit_cleanup(RERR_FILESELECT); } } @@ -1276,7 +1298,7 @@ void flist_free(struct file_list *flist) */ static void clean_flist(struct file_list *flist, int strip_root, int no_dups) { - int i; + int i, prev_i = 0; char *name, *prev_name = NULL; if (!flist || flist->count == 0) @@ -1287,6 +1309,7 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups) for (i = no_dups? 0 : flist->count; i < flist->count; i++) { if (flist->files[i]->basename) { + prev_i = i; prev_name = f_name(flist->files[i]); break; } @@ -1301,6 +1324,11 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups) "removing duplicate name %s from file list %d\n", name, i); } + /* Make sure that if we unduplicate '.', that we don't + * lose track of a user-specified starting point (or + * else deletions will mysteriously fail with -R). */ + if (flist->files[i]->flags & FLAG_DELETE) + flist->files[prev_i]->flags |= FLAG_DELETE; /* it's not great that the flist knows the semantics of * the file memory usage, but i'd rather not add a flag * byte to that struct. @@ -1310,6 +1338,10 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups) else free_file(flist->files[i]); } + else + prev_i = i; + /* We set prev_name every iteration to avoid it becoming + * invalid when names[][] in f_name() wraps around. */ prev_name = name; }