added --backup-dir option from Bob Edwards

[rsync/rsync.git] / flist.c

diff --git a/flist.c b/flist.c
index 3a44aa7..14fa5a3 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -23,8 +23,6 @@
 
 extern struct stats stats;
 
-extern int csum_length;
-
 extern int verbose;
 extern int am_server;
 extern int always_checksum;
@@ -47,6 +45,7 @@ extern int copy_links;
 extern int copy_unsafe_links;
 extern int remote_version;
 extern int io_error;
+extern int sanitize_paths;
 
 static char topsrcname[MAXPATHLEN];
 
@@ -254,7 +253,11 @@ static void send_file_entry(struct file_struct *file,int f,unsigned base_flags)
 #endif
 
        if (always_checksum) {
-               write_buf(f,file->sum,csum_length);
+               if (remote_version < 21) {
+                       write_buf(f,file->sum,2);
+               } else {
+                       write_buf(f,file->sum,MD4_SUM_LENGTH);
+               }
        }       
 
        last_mode = file->mode;
@@ -307,6 +310,10 @@ static void receive_file_entry(struct file_struct **fptr,
 
        clean_fname(thisname);
 
+       if (sanitize_paths) {
+               sanitize_path(thisname, NULL);
+       }
+
        if ((p = strrchr(thisname,'/'))) {
                static char *lastdir;
                *p = 0;
@@ -341,6 +348,9 @@ static void receive_file_entry(struct file_struct **fptr,
                file->link = (char *)malloc(l+1);
                if (!file->link) out_of_memory("receive_file_entry 2");
                read_sbuf(f,file->link,l);
+               if (sanitize_paths) {
+                       sanitize_path(file->link, file->dirname);
+               }
        }
 
 #if SUPPORT_HARD_LINKS
@@ -353,7 +363,11 @@ static void receive_file_entry(struct file_struct **fptr,
        if (always_checksum) {
                file->sum = (char *)malloc(MD4_SUM_LENGTH);
                if (!file->sum) out_of_memory("md4 sum");
-               read_buf(f,file->sum,csum_length);
+               if (remote_version < 21) {
+                       read_buf(f,file->sum,2);
+               } else {
+                       read_buf(f,file->sum,MD4_SUM_LENGTH);
+               }
        }
   
        last_mode = file->mode;
@@ -395,7 +409,8 @@ static int skip_filesystem(char *fname, STRUCT_STAT *st)
        return (st2.st_dev != filesystem_dev);
 }
 
-static struct file_struct *make_file(int f, char *fname)
+/* create a file_struct for a named file */
+struct file_struct *make_file(int f, char *fname)
 {
        struct file_struct *file;
        STRUCT_STAT st;
@@ -408,6 +423,9 @@ static struct file_struct *make_file(int f, char *fname)
        strlcpy(cleaned_name, fname, MAXPATHLEN);
        cleaned_name[MAXPATHLEN-1] = 0;
        clean_fname(cleaned_name);
+       if (sanitize_paths) {
+               sanitize_path(cleaned_name, NULL);
+       }
        fname = cleaned_name;
 
        memset(sum,0,SUM_LENGTH);
@@ -638,7 +656,16 @@ struct file_list *send_file_list(int f,int argc,char *argv[])
 
                l = strlen(fname);
                if (l != 1 && fname[l-1] == '/') {
-                       strlcat(fname,".",MAXPATHLEN);
+                       if ((l == 2) && (fname[0] == '.')) {
+                               /*  Turn ./ into just . rather than ./.
+                                   This was put in to avoid a problem with
+                                     rsync -aR --delete from ./
+                                   The send_file_name() below of ./ was
+                                   mysteriously preventing deletes */
+                               fname[1] = 0;
+                       } else {
+                               strlcat(fname,".",MAXPATHLEN);
+                       }
                }
 
                if (link_stat(fname,&st) != 0) {
@@ -674,10 +701,17 @@ struct file_list *send_file_list(int f,int argc,char *argv[])
                                *p = '/';
                                for (p=fname+1; (p=strchr(p,'/')); p++) {
                                        int copy_links_saved = copy_links;
+                                       int recurse_saved = recurse;
                                        *p = 0;
                                        copy_links = copy_unsafe_links;
+                                       /* set recurse to 1 to prevent make_file
+                                          from ignoring directory, but still
+                                          turn off the recursive parameter to
+                                          send_file_name */
+                                       recurse = 1;
                                        send_file_name(f, flist, fname, 0, 0);
                                        copy_links = copy_links_saved;
+                                       recurse = recurse_saved;
                                        *p = '/';
                                }
                        } else {
@@ -704,8 +738,7 @@ struct file_list *send_file_list(int f,int argc,char *argv[])
                if (one_file_system)
                        set_filesystem(fname);
 
-               if (!recurse || !send_included_file_names(f,flist))
-                       send_file_name(f,flist,fname,recurse,FLAG_DELETE);
+               send_file_name(f,flist,fname,recurse,FLAG_DELETE);
 
                if (olddir != NULL) {
                        flist_dir = NULL;
@@ -736,7 +769,8 @@ struct file_list *send_file_list(int f,int argc,char *argv[])
 
        /* if protocol version is >= 17 then send the io_error flag */
        if (f != -1 && remote_version >= 17) {
-               write_int(f, io_error);
+               extern int module_id;
+               write_int(f, lp_ignore_errors(module_id)? 0 : io_error);
        }
 
        if (f != -1) {
@@ -821,7 +855,12 @@ struct file_list *recv_file_list(int f)
 
   /* if protocol version is >= 17 then recv the io_error flag */
   if (f != -1 && remote_version >= 17) {
-         io_error |= read_int(f);
+         extern int module_id;
+         if (lp_ignore_errors(module_id)) {
+                 read_int(f);
+         } else {
+                 io_error |= read_int(f);
+         }
   }
 
   if (list_only) {
@@ -883,7 +922,7 @@ int flist_find(struct file_list *flist,struct file_struct *f)
 /*
  * free up one file
  */
-static void free_file(struct file_struct *file)
+void free_file(struct file_struct *file)
 {
        if (!file) return;
        if (file->basename) free(file->basename);
@@ -960,12 +999,12 @@ static void clean_flist(struct file_list *flist, int strip_root)
        if (verbose <= 3) return;
 
        for (i=0;i<flist->count;i++) {
-               rprintf(FINFO,"[%d] i=%d %s %s mode=0%o len=%d\n",
+               rprintf(FINFO,"[%d] i=%d %s %s mode=0%o len=%.0f\n",
                        getpid(), i, 
                        NS(flist->files[i]->dirname),
                        NS(flist->files[i]->basename),
                        flist->files[i]->mode,
-                       (int)flist->files[i]->length);
+                       (double)flist->files[i]->length);
        }
 }