Added a comment.

[rsync/rsync.git] / flist.c

diff --git a/flist.c b/flist.c
index 476e750..3544e27 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -1159,42 +1159,20 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
                if (!relative_paths) {
                        p = strrchr(fname, '/');
                        if (p) {
-                               *p = 0;
+                               *p = '\0';
                                if (p == fname)
                                        dir = "/";
                                else
                                        dir = fname;
                                fname = p + 1;
                        }
-               } else if (implied_dirs && (p=strrchr(fname,'/')) && p != fname) {
-                       /* this ensures we send the intermediate directories,
-                          thus getting their permissions right */
-                       char *lp = lastpath, *fn = fname, *slash = fname;
-                       *p = 0;
-                       /* Skip any initial directories in our path that we
-                        * have in common with lastpath. */
-                       while (*fn && *lp == *fn) {
-                               if (*fn == '/')
-                                       slash = fn;
-                               lp++, fn++;
-                       }
-                       *p = '/';
-                       if (fn != p || (*lp && *lp != '/')) {
-                               int save_copy_links = copy_links;
-                               int save_xfer_dirs = xfer_dirs;
-                               copy_links = copy_unsafe_links;
-                               xfer_dirs = 1;
-                               while ((slash = strchr(slash+1, '/')) != 0) {
-                                       *slash = 0;
-                                       send_file_name(f, flist, fname, 0);
-                                       *slash = '/';
-                               }
-                               copy_links = save_copy_links;
-                               xfer_dirs = save_xfer_dirs;
-                               *p = 0;
-                               strlcpy(lastpath, fname, sizeof lastpath);
-                               *p = '/';
-                       }
+               } else if ((p = strstr(fname, "/./")) != NULL) {
+                       *p = '\0';
+                       if (p == fname)
+                               dir = "/";
+                       else
+                               dir = fname;
+                       fname = p + 3;
                }
 
                if (!*fname)
@@ -1222,6 +1200,37 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
                        }
                }
 
+               if (implied_dirs && (p=strrchr(fname,'/')) && p != fname) {
+                       /* Send the implied directories at the start of the
+                        * source spec, so we get their permissions right. */
+                       char *lp = lastpath, *fn = fname, *slash = fname;
+                       *p = '\0';
+                       /* Skip any initial directories in our path that we
+                        * have in common with lastpath. */
+                       while (*fn && *lp == *fn) {
+                               if (*fn == '/')
+                                       slash = fn;
+                               lp++, fn++;
+                       }
+                       *p = '/';
+                       if (fn != p || (*lp && *lp != '/')) {
+                               int save_copy_links = copy_links;
+                               int save_xfer_dirs = xfer_dirs;
+                               copy_links = copy_unsafe_links;
+                               xfer_dirs = 1;
+                               while ((slash = strchr(slash+1, '/')) != 0) {
+                                       *slash = '\0';
+                                       send_file_name(f, flist, fname, 0);
+                                       *slash = '/';
+                               }
+                               copy_links = save_copy_links;
+                               xfer_dirs = save_xfer_dirs;
+                               *p = '\0';
+                               strlcpy(lastpath, fname, sizeof lastpath);
+                               *p = '/';
+                       }
+               }
+
                if (one_file_system)
                        filesystem_dev = st.st_dev;
 
@@ -1235,7 +1244,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
                        flist_dir_len = 0;
                        if (!pop_dir(olddir)) {
                                rsyserr(FERROR, errno, "pop_dir %s failed",
-                                       full_fname(dir));
+                                       full_fname(olddir));
                                exit_cleanup(RERR_FILESELECT);
                        }
                }