A simple change to change_pathname() to ensure that the error output

[rsync/rsync.git] / flist.c

diff --git a/flist.c b/flist.c
index 2c1094b..b0b05dc 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -244,7 +244,7 @@ static inline int is_daemon_excluded(const char *fname, int is_dir)
 
 static inline int path_is_daemon_excluded(char *path, int ignore_filename)
 {
-       if (daemon_filter_list.head && path) {
+       if (daemon_filter_list.head) {
                char *slash = path;
 
                while ((slash = strchr(slash+1, '/')) != NULL) {
@@ -293,7 +293,6 @@ static void send_directory(int f, struct file_list *flist,
 static const char *pathname, *orig_dir;
 static int pathname_len;
 
-
 /* Make sure flist can hold at least flist->used + extra entries. */
 static void flist_expand(struct file_list *flist, int extra)
 {
@@ -339,30 +338,51 @@ static void flist_done_allocating(struct file_list *flist)
                flist->pool_boundary = ptr;
 }
 
-int push_pathname(const char *dir, int len)
+/* Call this with EITHER (1) "file, NULL, 0" to chdir() to the file's
+ * F_PATHNAME(), or (2) "NULL, dir, dirlen" to chdir() to the supplied dir,
+ * with dir == NULL taken to be the starting directory, and dirlen < 0
+ * indicating that strdup(dir) should be called and then the -dirlen length
+ * value checked to ensure that it is not daemon-excluded. */
+int change_pathname(struct file_struct *file, const char *dir, int dirlen)
 {
-       if (dir == pathname)
-               return 1;
+       if (dirlen < 0) {
+               char *cpy = strdup(dir);
+               if (*cpy != '/')
+                       change_dir(orig_dir, CD_SKIP_CHDIR);
+               if (path_is_daemon_excluded(cpy, 0))
+                       goto chdir_error;
+               dir = cpy;
+               dirlen = -dirlen;
+       } else {
+               if (file) {
+                       if (pathname == F_PATHNAME(file))
+                               return 1;
+                       dir = F_PATHNAME(file);
+                       if (dir)
+                               dirlen = strlen(dir);
+               } else if (pathname == dir)
+                       return 1;
+               if (dir && *dir != '/')
+                       change_dir(orig_dir, CD_SKIP_CHDIR);
+       }
 
-       if (!orig_dir)
-               orig_dir = strdup(curr_dir);
+       pathname = dir;
+       pathname_len = dirlen;
 
-       if (pathname && !pop_dir(orig_dir)) {
-               rsyserr(FERROR, errno, "pop_dir %s failed",
-                       full_fname(orig_dir));
-               exit_cleanup(RERR_FILESELECT);
-       }
+       if (!dir)
+               dir = orig_dir;
 
-       if (dir && !push_dir(dir, 0)) {
+       if (!change_dir(dir, CD_NORMAL)) {
+         chdir_error:
                io_error |= IOERR_GENERAL;
-               rsyserr(FERROR, errno, "push_dir %s failed in %s",
-                       full_fname(dir), curr_dir);
+               rsyserr(FERROR, errno, "change_dir %s failed", full_fname(dir));
+               if (dir != orig_dir)
+                       change_dir(orig_dir, CD_NORMAL);
+               pathname = NULL;
+               pathname_len = 0;
                return 0;
        }
 
-       pathname = dir;
-       pathname_len = len >= 0 ? len : dir ? (int)strlen(dir) : 0;
-
        return 1;
 }
 
@@ -1667,10 +1687,8 @@ static void send1extra(int f, struct file_struct *file, struct file_list *flist)
        f_name(file, fbuf);
        dlen = strlen(fbuf);
 
-       if (F_PATHNAME(file) != pathname) {
-               if (!push_pathname(F_PATHNAME(file), -1))
-                       exit_cleanup(RERR_FILESELECT);
-       }
+       if (!change_pathname(file, NULL, 0))
+               exit_cleanup(RERR_FILESELECT);
 
        change_local_filter_dir(fbuf, dlen, send_dir_depth);
 
@@ -1853,6 +1871,9 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
        start_write = stats.total_written;
        gettimeofday(&start_tv, NULL);
 
+       if (!orig_dir)
+               orig_dir = strdup(curr_dir);
+
        if (relative_paths && protocol_version >= 30)
                implied_dirs = 1; /* We send flagged implied dirs */
 
@@ -1870,9 +1891,9 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 
        disable_buffering = io_start_buffering_out(f);
        if (filesfrom_fd >= 0) {
-               if (argv[0] && !push_dir(argv[0], 0)) {
-                       rsyserr(FERROR_XFER, errno, "push_dir %s failed in %s",
-                               full_fname(argv[0]), curr_dir);
+               if (argv[0] && !change_dir(argv[0], CD_NORMAL)) {
+                       rsyserr(FERROR_XFER, errno, "change_dir %s failed",
+                               full_fname(argv[0]));
                        exit_cleanup(RERR_FILESELECT);
                }
                use_ff_fd = 1;
@@ -1995,17 +2016,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 (path_is_daemon_excluded(dir, 0)) {
-                               io_error |= IOERR_GENERAL;
-                               rsyserr(FERROR, errno, "push_dir %s failed in %s",
-                                       full_fname(dir), curr_dir);
-                               continue;
-                       }
-                       if (!push_pathname(dir ? strdup(dir) : NULL, dirlen))
+                       if (!change_pathname(NULL, dir, -dirlen))
                                continue;
                        lastdir = pathname;
                        lastdir_len = pathname_len;
-               } else if (!push_pathname(lastdir, lastdir_len))
+               } else if (!change_pathname(NULL, lastdir, lastdir_len))
                        continue;
 
                if (fn != fbuf)