Adding more calls to safe_fname().

[rsync/rsync.git] / flist.c

diff --git a/flist.c b/flist.c
index e85b510..0e81e9e 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -153,14 +153,14 @@ static void list_file_entry(struct file_struct *f)
                rprintf(FINFO, "%s %11.0f %s %s -> %s\n",
                        perms,
                        (double)f->length, timestring(f->modtime),
-                       f_name(f), f->u.link);
+                       safe_fname(f_name(f)), f->u.link);
        } else
 #endif
        {
                rprintf(FINFO, "%s %11.0f %s %s\n",
                        perms,
                        (double)f->length, timestring(f->modtime),
-                       f_name(f));
+                       safe_fname(f_name(f)));
        }
 }
 
@@ -1746,13 +1746,10 @@ void delete_missing(struct file_list *full_list, struct file_list *dir_list,
                                        rprintf(FINFO, "deleting %s\n",
                                                safe_fname(f));
                                }
-                       } else if (S_ISDIR(mode)) {
-                               int dflag = delete_during ? DEL_FORCE_RECURSE
-                                                         : DEL_NO_RECURSE;
-                               delete_file(f, DEL_DIR | dflag);
-                       } else {
+                       } else if (S_ISDIR(mode))
+                               delete_file(f, DEL_DIR | DEL_FORCE_RECURSE);
+                       else
                                delete_file(f, 0);
-                       }
                        deletion_count++;
                        if (max_delete && deletion_count >= max_delete)
                                break;