- Use popt to better effect for the two options that can be both

[rsync/rsync.git] / flist.c

diff --git a/flist.c b/flist.c
index 922db46..b37a192 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -61,13 +61,11 @@ 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_filelist_p(void)
@@ -221,8 +219,11 @@ int readlink_stat(const char *path, STRUCT_STAT * buffer, char *linkbuf)
                if (l == -1) 
                        return -1;
                linkbuf[l] = 0;
-               if (copy_unsafe_links && (topsrcname[0] != '\0') &&
-                   unsafe_symlink(linkbuf, topsrcname)) {
+               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);
                }
        }
@@ -895,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);
 
@@ -1000,8 +1002,6 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
                }
        }
 
-       topsrcname[0] = '\0';
-
        if (f != -1) {
                send_file_entry(NULL, f, 0);
        }
@@ -1010,7 +1010,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
                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 */
@@ -1087,7 +1087,7 @@ 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 (show_filelist_p()) {
                finish_filelist_progress(flist);
@@ -1197,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;
 
@@ -1246,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;
@@ -1256,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_
@@ -1299,7 +1304,6 @@ static void clean_flist(struct file_list *flist, int strip_root)
                }
        }
 
-
        if (verbose <= 3)
                return;