Adding more calls to safe_fname().

[rsync/rsync.git] / generator.c

diff --git a/generator.c b/generator.c
index e58f7b0..8f3177c 100644 (file)
--- a/generator.c
+++ b/generator.c
@@ -251,8 +251,10 @@ static void recv_generator(char *fname, struct file_list *flist,
        if (list_only)
                return;
 
-       if (verbose > 2)
-               rprintf(FINFO, "recv_generator(%s,%d)\n", safe_fname(fname), ndx);
+       if (verbose > 2) {
+               rprintf(FINFO, "recv_generator(%s,%d)\n",
+                       safe_fname(fname), ndx);
+       }
 
        if (server_filter_list.head
            && check_filter(&server_filter_list, fname,
@@ -314,14 +316,14 @@ static void recv_generator(char *fname, struct file_list *flist,
                    && verbose && f_out != -1)
                        rprintf(FINFO, "%s/\n", safe_fname(fname));
                if (delete_during && f_out != -1 && csum_length != SUM_LENGTH
-                   && (file->flags & FLAG_DEL_START)) {
-                       delete_in_dir(flist, fname, strlen(fname),
-                                     file->dir.depth);
-               }
+                   && (file->flags & FLAG_DEL_HERE))
+                       delete_in_dir(flist, fname, file);
                return;
        } else if (max_size && file->length > max_size) {
-               if (verbose > 1)
-                       rprintf(FINFO, "%s is over max-size\n", fname);
+               if (verbose > 1) {
+                       rprintf(FINFO, "%s is over max-size\n",
+                               safe_fname(fname));
+               }
                return;
        }
 
@@ -329,8 +331,10 @@ static void recv_generator(char *fname, struct file_list *flist,
 #if SUPPORT_LINKS
                if (safe_symlinks && unsafe_symlink(file->u.link, fname)) {
                        if (verbose) {
-                               rprintf(FINFO, "ignoring unsafe symlink %s -> \"%s\"\n",
-                                       full_fname(fname), file->u.link);
+                               rprintf(FINFO,
+                                       "ignoring unsafe symlink %s -> \"%s\"\n",
+                                       full_fname(fname),
+                                       safe_fname(file->u.link));
                        }
                        return;
                }
@@ -448,7 +452,7 @@ static void recv_generator(char *fname, struct file_list *flist,
                                        if (verbose) {
                                                rsyserr(FINFO, errno,
                                                        "link %s => %s",
-                                                       fnamecmpbuf,
+                                                       full_fname(fnamecmpbuf),
                                                        safe_fname(fname));
                                        }
                                        fnamecmp = fnamecmpbuf;
@@ -595,7 +599,7 @@ notify_others:
                        set_perms(backupptr, back_file, NULL, 0);
                        if (verbose > 1) {
                                rprintf(FINFO, "backed up %s to %s\n",
-                                       fname, backupptr);
+                                       safe_fname(fname), safe_fname(backupptr));
                        }
                        free(back_file);
                }
@@ -654,7 +658,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name,
                               flist, file, i, f_out, f_out_name);
        }
        if (delete_during)
-               delete_in_dir(NULL, NULL, 0, 0);
+               delete_in_dir(NULL, NULL, NULL);
 
        phase++;
        csum_length = SUM_LENGTH;