X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/5d2c5c4c7338004528d8df111e37fd992622e092..afb6e9450d714f78d16ff7129baab0e0dfbbb075:/flist.c diff --git a/flist.c b/flist.c index 0761497e..b37a1924 100644 --- a/flist.c +++ b/flist.c @@ -34,6 +34,7 @@ extern struct stats stats; extern int verbose; +extern int do_progress; extern int am_server; extern int always_checksum; @@ -60,41 +61,51 @@ extern int sanitize_paths; extern int read_batch; extern int write_batch; -static char topsrcname[MAXPATHLEN]; - static struct exclude_struct **local_exclude_list; static struct file_struct null_file; -static void clean_flist(struct file_list *flist, int strip_root); +static void clean_flist(struct file_list *flist, int strip_root, int no_dups); -static int show_build_progress_p(void) +static int show_filelist_p(void) { - extern int do_progress; + return verbose && recurse && !am_server; +} - return do_progress && verbose && recurse && !am_server; +static void start_filelist_progress(char *kind) +{ + rprintf(FINFO, "%s ... ", kind); + if ((verbose > 1) || do_progress) + rprintf(FINFO, "\n"); + rflush(FINFO); } -/** - * True if we're local, etc, and should emit progress emssages. - **/ -static void emit_build_progress(const struct file_list *flist) + +static void emit_filelist_progress(const struct file_list *flist) { rprintf(FINFO, " %d files...\r", flist->count); } -static void finish_build_progress(const struct file_list *flist) +static void maybe_emit_filelist_progress(const struct file_list *flist) { - if (verbose && recurse && !am_server) { - /* This overwrites the progress line, if any. */ - rprintf(FINFO, RSYNC_NAME ": %d files to consider.\n", - flist->count); - } + if (do_progress && show_filelist_p() && ((flist->count % 100) == 0)) + emit_filelist_progress(flist); } +static void finish_filelist_progress(const struct file_list *flist) +{ + if (do_progress) { + /* This overwrites the progress line */ + rprintf(FINFO, "%d file%sto consider\n", + flist->count, flist->count == 1 ? " " : "s "); + } else { + rprintf(FINFO, "done\n"); + } +} + void show_flist_stats(void) { /* Nothing yet */ @@ -179,44 +190,59 @@ static void list_file_entry(struct file_struct *f) } -int readlink_stat(const char *Path, STRUCT_STAT * Buffer, char *Linkbuf) +/** + * Stat either a symlink or its referent, depending on the settings of + * copy_links, copy_unsafe_links, etc. + * + * @retval -1 on error + * + * @retval 0 for success + * + * @post If @p path is a symlink, then @p linkbuf (of size @c + * MAXPATHLEN) contains the symlink target. + * + * @post @p buffer contains information about the link or the + * referrent as appropriate, if they exist. + **/ +int readlink_stat(const char *path, STRUCT_STAT * buffer, char *linkbuf) { #if SUPPORT_LINKS if (copy_links) { - return do_stat(Path, Buffer); + return do_stat(path, buffer); } - if (do_lstat(Path, Buffer) == -1) { + if (do_lstat(path, buffer) == -1) { return -1; } - if (S_ISLNK(Buffer->st_mode)) { + if (S_ISLNK(buffer->st_mode)) { int l; - if ((l = - readlink((char *) Path, Linkbuf, - MAXPATHLEN - 1)) == -1) { + l = readlink((char *) path, linkbuf, MAXPATHLEN - 1); + if (l == -1) return -1; - } - Linkbuf[l] = 0; - if (copy_unsafe_links && (topsrcname[0] != '\0') && - unsafe_symlink(Linkbuf, topsrcname)) { - return do_stat(Path, Buffer); + linkbuf[l] = 0; + if (copy_unsafe_links && unsafe_symlink(linkbuf, path)) { + if (verbose > 1) { + rprintf(FINFO,"copying unsafe symlink \"%s\" -> \"%s\"\n", + path, linkbuf); + } + return do_stat(path, buffer); } } return 0; #else - return do_stat(Path, Buffer); + return do_stat(path, buffer); #endif } -int link_stat(const char *Path, STRUCT_STAT * Buffer) +int link_stat(const char *path, STRUCT_STAT * buffer) { #if SUPPORT_LINKS if (copy_links) { - return do_stat(Path, Buffer); + return do_stat(path, buffer); } else { - return do_lstat(Path, Buffer); + return do_lstat(path, buffer); } #else - return do_stat(Path, Buffer); + return do_stat(path, buffer); #endif } @@ -279,13 +305,29 @@ static char *flist_dir; static void flist_expand(struct file_list *flist) { if (flist->count >= flist->malloced) { + size_t new_bytes; + void *new_ptr; + if (flist->malloced < 1000) flist->malloced += 1000; else flist->malloced *= 2; - flist->files = (struct file_struct **) - realloc(flist->files, - sizeof(flist->files[0]) * flist->malloced); + + new_bytes = sizeof(flist->files[0]) * flist->malloced; + + if (flist->files) + new_ptr = realloc(flist->files, new_bytes); + else + new_ptr = malloc(new_bytes); + + if (verbose >= 2) { + rprintf(FINFO, "expand file_list to %.0f bytes, did%s move\n", + (double) new_bytes, + (new_ptr == flist->files) ? " not" : ""); + } + + flist->files = (struct file_struct **) new_ptr; + if (!flist->files) out_of_memory("flist_expand"); } @@ -298,7 +340,7 @@ static void send_file_entry(struct file_struct *file, int f, unsigned char flags; static time_t last_time; static mode_t last_mode; - static dev_t last_rdev; + static DEV64_T last_rdev; static uid_t last_uid; static gid_t last_gid; static char lastname[MAXPATHLEN]; @@ -313,6 +355,8 @@ static void send_file_entry(struct file_struct *file, int f, return; } + io_write_phase = "send_file_entry"; + fname = f_name(file); flags = base_flags; @@ -408,6 +452,8 @@ static void send_file_entry(struct file_struct *file, int f, strlcpy(lastname, fname, MAXPATHLEN); lastname[MAXPATHLEN - 1] = 0; + + io_write_phase = "unknown"; } @@ -417,7 +463,7 @@ static void receive_file_entry(struct file_struct **fptr, { static time_t last_time; static mode_t last_mode; - static dev_t last_rdev; + static DEV64_T last_rdev; static uid_t last_uid; static gid_t last_gid; static char lastname[MAXPATHLEN]; @@ -493,7 +539,7 @@ static void receive_file_entry(struct file_struct **fptr, (flags & SAME_GID) ? last_gid : (gid_t) read_int(f); if (preserve_devices && IS_DEVICE(file->mode)) file->rdev = - (flags & SAME_RDEV) ? last_rdev : (dev_t) read_int(f); + (flags & SAME_RDEV) ? last_rdev : (DEV64_T) read_int(f); if (preserve_links && S_ISLNK(file->mode)) { int l = read_int(f); @@ -577,7 +623,21 @@ static int skip_filesystem(char *fname, STRUCT_STAT * st) /* 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)) -/* create a file_struct for a named file */ +/** + * Create a file_struct for a named file by reading its stat() + * information and performing extensive checks against global + * options. + * + * @return the new file, or NULL if there was an error or this file + * should be excluded. + * + * @todo There is a small optimization opportunity here to avoid + * stat()ing the file in some circumstances, which has a certain cost. + * We are called immediately after doing readdir(), and so we may + * already know the d_type of the file. We could for example avoid + * 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) { @@ -601,8 +661,10 @@ 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) && copy_links && !noexcludes) { - /* symlink pointing nowhere, see if excluded */ + if ((errno == ENOENT) && !noexcludes) { + /* 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)) { /* file is excluded anyway, ignore silently */ @@ -669,7 +731,7 @@ struct file_struct *make_file(int f, char *fname, struct string_area **ap, file->gid = st.st_gid; file->dev = st.st_dev; file->inode = st.st_ino; -#ifdef HAVE_ST_RDEV +#ifdef HAVE_STRUCT_STAT_ST_RDEV file->rdev = st.st_rdev; #endif @@ -723,8 +785,7 @@ void send_file_name(int f, struct file_list *flist, char *fname, if (!file) return; - if (show_build_progress_p() & !(flist->count % 100)) - emit_build_progress(flist); + maybe_emit_filelist_progress(flist); flist_expand(flist); @@ -809,11 +870,11 @@ static void send_directory(int f, struct file_list *flist, char *dir) } -/* +/** * - * I *think* f==-1 means that the list should just be built in memory - * and not transmitted. But who can tell? -- mbp - */ + * I think f==-1 means that the list should just be built in + * memory and not transmitted. But who can tell? -- mbp + **/ struct file_list *send_file_list(int f, int argc, char *argv[]) { int i, l; @@ -823,12 +884,8 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) struct file_list *flist; int64 start_write; - if (verbose && recurse && !am_server && f != -1) { - rprintf(FINFO, RSYNC_NAME ": building file list...\n"); - if (verbose > 1) - rprintf(FINFO, "\n"); - rflush(FINFO); - } + if (show_filelist_p() && f != -1) + start_filelist_progress("building file list"); start_write = stats.total_written; @@ -839,7 +896,8 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) } for (i = 0; i < argc; i++) { - char *fname = topsrcname; + char fname2[MAXPATHLEN]; + char *fname = fname2; strlcpy(fname, argv[i], MAXPATHLEN); @@ -944,15 +1002,15 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) } } - topsrcname[0] = '\0'; - if (f != -1) { send_file_entry(NULL, f, 0); } - finish_build_progress(flist); + if (show_filelist_p() && f != -1) { + finish_filelist_progress(flist); + } - clean_flist(flist, 0); + clean_flist(flist, 0, 0); /* now send the uid/gid list. This was introduced in protocol version 15 */ @@ -967,7 +1025,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) } if (f != -1) { - io_end_buffering(f); + io_end_buffering(); stats.flist_size = stats.total_written - start_write; stats.num_files = flist->count; if (write_batch) /* dw */ @@ -988,10 +1046,8 @@ struct file_list *recv_file_list(int f) int64 start_read; extern int list_only; - if (verbose && recurse && !am_server) { - rprintf(FINFO, "receiving file list ... "); - rflush(FINFO); - } + if (show_filelist_p()) + start_filelist_progress("receiving file list"); start_read = stats.total_read; @@ -1020,6 +1076,8 @@ struct file_list *recv_file_list(int f) flist->count++; + maybe_emit_filelist_progress(flist); + if (verbose > 2) rprintf(FINFO, "recv_file_name(%s)\n", f_name(flist->files[i])); @@ -1029,10 +1087,10 @@ struct file_list *recv_file_list(int f) if (verbose > 2) rprintf(FINFO, "received %d names\n", flist->count); - clean_flist(flist, relative_paths); + clean_flist(flist, relative_paths, 1); - if (verbose && recurse && !am_server) { - rprintf(FINFO, "done\n"); + if (show_filelist_p()) { + finish_filelist_progress(flist); } /* now recv the uid/gid list. This was introduced in protocol version 15 */ @@ -1095,7 +1153,9 @@ int flist_find(struct file_list *flist, struct file_struct *f) { int low = 0, high = flist->count - 1; - if (flist->count <= 0) + while (high >= 0 && !flist->files[high]->basename) high--; + + if (high < 0) return -1; while (low != high) { @@ -1137,7 +1197,7 @@ void free_file(struct file_struct *file) /* * allocate a new file list */ -struct file_list *flist_new() +struct file_list *flist_new(void) { struct file_list *flist; @@ -1186,9 +1246,10 @@ void flist_free(struct file_list *flist) * This routine ensures we don't have any duplicate names in our file list. * duplicate names can cause corruption because of the pipelining */ -static void clean_flist(struct file_list *flist, int strip_root) +static void clean_flist(struct file_list *flist, int strip_root, int no_dups) { int i; + char *name, *prev_name = NULL; if (!flist || flist->count == 0) return; @@ -1196,30 +1257,34 @@ static void clean_flist(struct file_list *flist, int strip_root) qsort(flist->files, flist->count, sizeof(flist->files[0]), (int (*)()) file_compare); - for (i = 1; i < flist->count; i++) { - if (flist->files[i]->basename && - flist->files[i - 1]->basename && - strcmp(f_name(flist->files[i]), - f_name(flist->files[i - 1])) == 0) { - if (verbose > 1 && !am_server) + for (i = no_dups? 0 : flist->count; i < flist->count; i++) { + if (flist->files[i]->basename) { + prev_name = f_name(flist->files[i]); + break; + } + } + while (++i < flist->count) { + if (!flist->files[i]->basename) + continue; + name = f_name(flist->files[i]); + if (strcmp(name, prev_name) == 0) { + if (verbose > 1 && !am_server) { rprintf(FINFO, "removing duplicate name %s from file list %d\n", - f_name(flist->files[i - 1]), - i - 1); - /* 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. XXX can i use a bit in the flags field? */ + name, i); + } + /* 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. + * XXX can i use a bit in the flags field? */ if (flist->string_area) flist->files[i][0] = null_file; else free_file(flist->files[i]); } + prev_name = name; } - /* FIXME: There is a bug here when filenames are repeated more - * than once, because we don't handle freed files when doing - * the comparison. */ - if (strip_root) { /* we need to strip off the root directory in the case of relative paths, but this must be done _after_ @@ -1239,7 +1304,6 @@ static void clean_flist(struct file_list *flist, int strip_root) } } - if (verbose <= 3) return;