Mention the latest changes.

[rsync/rsync.git] / flist.c

diff --git a/flist.c b/flist.c
index 412b089..c46098f 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -34,6 +34,7 @@ extern int do_progress;
 extern int am_root;
 extern int am_server;
 extern int am_daemon;
+extern int am_sender;
 extern int always_checksum;
 extern int module_id;
 extern int ignore_errors;
@@ -531,7 +532,7 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags,
        static uid_t uid;
        static gid_t gid;
        static char lastname[MAXPATHLEN], *lastdir;
-       static int lastdir_len = -1;
+       static int lastdir_depth, lastdir_len = -1;
        char thisname[MAXPATHLEN];
        unsigned int l1 = 0, l2 = 0;
        int alloc_len, basename_len, dirname_len, linkname_len, sum_len;
@@ -570,10 +571,10 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags,
 
        strlcpy(lastname, thisname, MAXPATHLEN);
 
-       clean_fname(thisname);
+       clean_fname(thisname, 0);
 
        if (sanitize_paths)
-               sanitize_path(thisname, NULL);
+               sanitize_path(thisname, thisname, "", 0);
 
        if ((basename = strrchr(thisname, '/')) != NULL) {
                dirname_len = ++basename - thisname; /* counts future '\0' */
@@ -656,6 +657,8 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags,
                memcpy(bp, dirname, dirname_len - 1);
                bp += dirname_len;
                bp[-1] = '\0';
+               if (sanitize_paths)
+                       lastdir_depth = count_dir_elements(lastdir);
        } else if (dirname)
                file->dirname = dirname;
 
@@ -671,7 +674,7 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags,
                file->u.link = bp;
                read_sbuf(f, bp, linkname_len - 1);
                if (sanitize_paths)
-                       sanitize_path(bp, lastdir);
+                       sanitize_path(bp, bp, "", lastdir_depth);
                bp += linkname_len;
        }
 #endif
@@ -759,9 +762,9 @@ struct file_struct *make_file(char *fname, struct file_list *flist,
                rprintf(FINFO, "skipping overly long name: %s\n", fname);
                return NULL;
        }
-       clean_fname(thisname);
+       clean_fname(thisname, 0);
        if (sanitize_paths)
-               sanitize_path(thisname, NULL);
+               sanitize_path(thisname, thisname, "", 0);
 
        memset(sum, 0, SUM_LENGTH);
 
@@ -1077,13 +1080,13 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
                if (use_ff_fd) {
                        if (read_filesfrom_line(filesfrom_fd, fname) == 0)
                                break;
-                       sanitize_path(fname, NULL);
+                       sanitize_path(fname, fname, "", 0);
                } else {
                        if (argc-- == 0)
                                break;
                        strlcpy(fname, *argv++, MAXPATHLEN);
                        if (sanitize_paths)
-                               sanitize_path(fname, NULL);
+                               sanitize_path(fname, fname, "", 0);
                }
 
                l = strlen(fname);
@@ -1485,7 +1488,7 @@ static void output_flist(struct file_list *flist)
 
        for (i = 0; i < flist->count; i++) {
                file = flist->files[i];
-               if (am_root && preserve_uid)
+               if ((am_root || am_sender) && preserve_uid)
                        sprintf(uidbuf, " uid=%ld", (long)file->uid);
                else
                        *uidbuf = '\0';