- If two duplicate directories have identical outside-the-transfer

[rsync/rsync.git] / flist.c

diff --git a/flist.c b/flist.c
index 688117c..a67a1b4 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -1551,6 +1551,7 @@ void send_extra_file_list(int f, int at_least)
        while (future_cnt < at_least) {
                struct file_struct *file = dir_flist->sorted[send_dir_ndx];
                int dir_ndx, dstart = dir_count;
+               const char *pathname = F_PATHNAME(file);
                int32 *dp;
 
                flist = flist_new(0, "send_extra_file_list");
@@ -1575,7 +1576,8 @@ void send_extra_file_list(int f, int at_least)
                    && dir_flist->sorted[dir_ndx]->flags & FLAG_DUPLICATE) {
                        send_dir_ndx = dir_ndx;
                        file = dir_flist->sorted[dir_ndx];
-                       send1extra(f, file, flist);
+                       if (F_PATHNAME(file) != pathname)
+                               send1extra(f, file, flist);
                        dp = F_DIR_NODE_P(file);
                }
 
@@ -1791,16 +1793,11 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
                dirlen = dir ? strlen(dir) : 0;
                if (dirlen != lastdir_len || memcmp(lastdir, dir, dirlen) != 0) {
                        if (!push_pathname(dir ? strdup(dir) : NULL, dirlen))
-                               goto push_error;
+                               continue;
                        lastdir = pathname;
                        lastdir_len = pathname_len;
-               } else if (!push_pathname(lastdir, lastdir_len)) {
-                 push_error:
-                       io_error |= IOERR_GENERAL;
-                       rsyserr(FERROR, errno, "push_dir %s failed in %s",
-                               full_fname(dir), curr_dir);
+               } else if (!push_pathname(lastdir, lastdir_len))
                        continue;
-               }
 
                if (fn != fbuf)
                        memmove(fbuf, fn, len + 1);
@@ -2303,19 +2300,20 @@ static void clean_flist(struct file_list *flist, int strip_root)
                        int keep, drop;
                        /* If one is a dir and the other is not, we want to
                         * keep the dir because it might have contents in the
-                        * list. */
+                        * list.  Otherwise keep the first one. */
                        if (S_ISDIR(file->mode)) {
                                struct file_struct *fp = flist->sorted[j];
-                               if (!S_ISDIR(fp->mode))
+                               if (!S_ISDIR(fp->mode) || !(fp->flags & FLAG_XFER_DIR))
                                        keep = i, drop = j;
-                               else
+                               else {
+                                       if (am_sender)
+                                               file->flags |= FLAG_DUPLICATE;
                                        keep = j, drop = i;
+                               }
                        } else
                                keep = j, drop = i;
 
-                       if (am_sender)
-                               flist->sorted[drop]->flags |= FLAG_DUPLICATE;
-                       else {
+                       if (!am_sender) {
                                if (verbose > 1) {
                                        rprintf(FINFO,
                                            "removing duplicate name %s from file list (%d)\n",