X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/9e4c32ea54c4db458e75185482aea5a7a1656d45..1923b1fce4db5e19c56ac461962b84c560a617b4:/flist.c diff --git a/flist.c b/flist.c index 100ae9f0..c4459b11 100644 --- a/flist.c +++ b/flist.c @@ -342,7 +342,8 @@ static void flist_expand(struct file_list *flist) } if (verbose >= 2) { - rprintf(FINFO, "expand file_list to %.0f bytes, did%s move\n", + rprintf(FINFO, "[%s] expand file_list to %.0f bytes, did%s move\n", + who_am_i(), (double)sizeof(flist->files[0]) * flist->malloced, (new_ptr == flist->files) ? " not" : ""); @@ -697,32 +698,6 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags, int f) } -/* determine if a file in a different filesystem should be skipped - when one_file_system is set. We bascally only want to include - the mount points - but they can be hard to find! */ -static int skip_filesystem(char *fname, STRUCT_STAT * st) -{ - STRUCT_STAT st2; - char *p = strrchr(fname, '/'); - - /* skip all but directories */ - if (!S_ISDIR(st->st_mode)) - return 1; - - /* if its not a subdirectory then allow */ - if (!p) - return 0; - - *p = 0; - if (link_stat(fname, &st2)) { - *p = '/'; - return 0; - } - *p = '/'; - - return (st2.st_dev != filesystem_dev); -} - #define STRDUP(ap, p) (ap ? string_area_strdup(ap, p) : strdup(p)) /* IRIX cc cares that the operands to the ternary have the same type. */ #define MALLOC(ap, i) (ap ? (void*) string_area_malloc(ap, i) : malloc(i)) @@ -749,35 +724,35 @@ struct file_struct *make_file(char *fname, struct string_area **ap, STRUCT_STAT st; char sum[SUM_LENGTH]; char *p; - char cleaned_name[MAXPATHLEN]; + char thisname[MAXPATHLEN]; char linkbuf[MAXPATHLEN]; + unsigned short flags = 0; - if (strlcpy(cleaned_name, fname, sizeof cleaned_name) - >= sizeof cleaned_name - flist_dir_len) { + if (strlcpy(thisname, fname, sizeof thisname) + >= sizeof thisname - flist_dir_len) { rprintf(FINFO, "skipping overly long name: %s\n", fname); return NULL; } - clean_fname(cleaned_name); + clean_fname(thisname); if (sanitize_paths) - sanitize_path(cleaned_name, NULL); - fname = cleaned_name; + sanitize_path(thisname, NULL); memset(sum, 0, SUM_LENGTH); - if (readlink_stat(fname, &st, linkbuf) != 0) { + if (readlink_stat(thisname, &st, linkbuf) != 0) { int save_errno = errno; 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 */ - if (check_exclude_file(fname, 0, exclude_level)) { + if (check_exclude_file(thisname, 0, exclude_level)) { /* file is excluded anyway, ignore silently */ return NULL; } } io_error |= IOERR_GENERAL; rprintf(FERROR, "readlink %s failed: %s\n", - full_fname(fname), strerror(save_errno)); + full_fname(thisname), strerror(save_errno)); return NULL; } @@ -786,45 +761,51 @@ struct file_struct *make_file(char *fname, struct string_area **ap, goto skip_excludes; if (S_ISDIR(st.st_mode) && !recurse && !files_from) { - rprintf(FINFO, "skipping directory %s\n", fname); + rprintf(FINFO, "skipping directory %s\n", thisname); return NULL; } if (one_file_system && st.st_dev != filesystem_dev) { - if (skip_filesystem(fname, &st)) + /* We allow a directory though to preserve the mount point. + * However, flag it so that we don't recurse. */ + if (!S_ISDIR(st.st_mode)) return NULL; + flags |= FLAG_MOUNT_POINT; } - if (check_exclude_file(fname, S_ISDIR(st.st_mode) != 0, exclude_level)) + if (check_exclude_file(thisname, S_ISDIR(st.st_mode) != 0, exclude_level)) return NULL; - if (lp_ignore_nonreadable(module_id) && access(fname, R_OK) != 0) + if (lp_ignore_nonreadable(module_id) && access(thisname, R_OK) != 0) return NULL; skip_excludes: - if (verbose > 2) - rprintf(FINFO, "make_file(%s,*,%d)\n", fname, exclude_level); + if (verbose > 2) { + rprintf(FINFO, "[%s] make_file(%s,*,%d)\n", + who_am_i(), thisname, exclude_level); + } file = new(struct file_struct); if (!file) out_of_memory("make_file"); memset((char *) file, 0, sizeof(*file)); + file->flags = flags; - if ((p = strrchr(fname, '/'))) { + if ((p = strrchr(thisname, '/'))) { static char *lastdir; *p = 0; - if (lastdir && strcmp(fname, lastdir) == 0) + if (lastdir && strcmp(thisname, lastdir) == 0) file->dirname = lastdir; else { - file->dirname = strdup(fname); + file->dirname = strdup(thisname); lastdir = file->dirname; } file->basename = STRDUP(ap, p + 1); *p = '/'; } else { file->dirname = NULL; - file->basename = STRDUP(ap, fname); + file->basename = STRDUP(ap, thisname); } file->modtime = st.st_mtime; @@ -854,7 +835,7 @@ struct file_struct *make_file(char *fname, struct string_area **ap, if (always_checksum && S_ISREG(st.st_mode)) { if (!(file->u.sum = (char*)MALLOC(ap, MD4_SUM_LENGTH))) out_of_memory("md4 sum"); - file_checksum(fname, file->u.sum, st.st_size); + file_checksum(thisname, file->u.sum, st.st_size); } file->basedir = flist_dir; @@ -893,7 +874,8 @@ void send_file_name(int f, struct file_list *flist, char *fname, send_file_entry(file, f, base_flags); } - if (S_ISDIR(file->mode) && recursive) { + if (recursive && S_ISDIR(file->mode) + && !(file->flags & FLAG_MOUNT_POINT)) { struct exclude_struct **last_exclude_list = local_exclude_list; send_directory(f, flist, f_name_to(file, fbuf)); local_exclude_list = last_exclude_list; @@ -1117,8 +1099,6 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) flist_dir = lastdir; flist_dir_len = lastdir_len; } else { - if (lastdir) - free(lastdir); flist_dir = lastdir = strdup(dir); flist_dir_len = lastdir_len = strlen(dir); } @@ -1436,8 +1416,9 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups) return; for (i = 0; i < flist->count; i++) { - rprintf(FINFO, "[%ld] i=%d %s %s mode=0%o len=%.0f\n", - (long) getpid(), i, + rprintf(FINFO, "[%s] i=%d %s %s %s mode=0%o len=%.0f\n", + who_am_i(), i, + NS(flist->files[i]->basedir), NS(flist->files[i]->dirname), NS(flist->files[i]->basename), (int) flist->files[i]->mode,