Don't add the "protect" filter rule for backup-suffix filenames

[rsync/rsync.git] / options.c

diff --git a/options.c b/options.c
index 6681158..2d09017 100644 (file)
--- a/options.c
+++ b/options.c
@@ -19,7 +19,7 @@
  */
 
 #include "rsync.h"
-#include "popt.h"
+#include <popt.h>
 #include "zlib/zlib.h"
 
 extern int module_id;
@@ -81,6 +81,7 @@ int numeric_ids = 0;
 int force_delete = 0;
 int io_timeout = 0;
 int allowed_lull = 0;
+int prune_empty_dirs = 0;
 char *files_from = NULL;
 int filesfrom_fd = -1;
 char *filesfrom_host = NULL;
@@ -323,6 +324,7 @@ void usage(enum logcode F)
   rprintf(F,"     --partial               keep partially transferred files\n");
   rprintf(F,"     --partial-dir=DIR       put a partially transferred file into DIR\n");
   rprintf(F,"     --delay-updates         put all updated files into place at transfer's end\n");
+  rprintf(F," -m, --prune-empty-dirs      prune empty directory chains from the file-list\n");
   rprintf(F,"     --numeric-ids           don't map uid/gid values by user/group name\n");
   rprintf(F,"     --timeout=TIME          set I/O timeout in seconds\n");
   rprintf(F," -I, --ignore-times          don't skip files that match in size and mod-time\n");
@@ -483,6 +485,7 @@ static struct poptOption long_options[] = {
   {"no-partial",       0,  POPT_ARG_VAL,    &keep_partial, 0, 0, 0 },
   {"partial-dir",      0,  POPT_ARG_STRING, &partial_dir, 0, 0, 0 },
   {"delay-updates",    0,  POPT_ARG_NONE,   &delay_updates, 0, 0, 0 },
+  {"prune-empty-dirs",'m', POPT_ARG_NONE,   &prune_empty_dirs, 0, 0, 0 },
   {"log-format",       0,  POPT_ARG_STRING, &log_format, 0, 0, 0 },
   {"itemize-changes", 'i', POPT_ARG_NONE,   0, 'i', 0, 0 },
   {"bwlimit",          0,  POPT_ARG_INT,    &bwlimit, 0, 0, 0 },
@@ -1259,7 +1262,7 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                snprintf(err_buf, sizeof err_buf,
                        "--suffix cannot be a null string without --backup-dir\n");
                return 0;
-       } else if (delete_mode && !delete_excluded) {
+       } else if (make_backups && delete_mode && !delete_excluded) {
                snprintf(backup_dir_buf, sizeof backup_dir_buf,
                        "P *%s", backup_suffix);
                parse_rule(&filter_list, backup_dir_buf, 0, 0);
@@ -1474,8 +1477,14 @@ void server_options(char **args,int *argc)
                argstr[x++] = 'L';
        if (xfer_dirs > (recurse || !delete_mode || !am_sender))
                argstr[x++] = 'd';
-       if (keep_dirlinks && am_sender)
-               argstr[x++] = 'K';
+       if (am_sender) {
+               if (keep_dirlinks)
+                       argstr[x++] = 'K';
+               if (prune_empty_dirs)
+                       argstr[x++] = 'm';
+               if (omit_dir_times == 2)
+                       argstr[x++] = 'O';
+       }
 
        if (whole_file > 0)
                argstr[x++] = 'W';
@@ -1493,8 +1502,6 @@ void server_options(char **args,int *argc)
                argstr[x++] = 'D';
        if (preserve_times)
                argstr[x++] = 't';
-       if (omit_dir_times == 2 && am_sender)
-               argstr[x++] = 'O';
        if (preserve_perms)
                argstr[x++] = 'p';
        if (recurse)