Fixed a failing hunk.

diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff
index 349f11d..6248f47 100644 (file)
--- a/backup-dir-dels.diff
+++ b/backup-dir-dels.diff
@@ -13,7 +13,7 @@ suffix.
 
 Marc St-Onge
 
---- orig/backup.c      2005-06-10 21:33:27
+--- orig/backup.c      2005-11-10 16:58:36
 +++ backup.c   2005-02-22 02:11:15
 @@ -22,11 +22,17 @@
  
@@ -106,9 +106,9 @@ Marc St-Onge
 +      deleting = 0;
 +      return ret;
 +}
---- orig/generator.c   2005-10-30 22:30:28
-+++ generator.c        2005-03-11 11:22:38
-@@ -88,16 +88,23 @@ extern dev_t filesystem_dev;
+--- orig/generator.c   2005-11-12 20:31:04
++++ generator.c        2005-11-15 07:02:12
+@@ -89,6 +89,9 @@ extern dev_t filesystem_dev;
  extern char *backup_dir;
  extern char *backup_suffix;
  extern int backup_suffix_len;
@@ -118,7 +118,8 @@ Marc St-Onge
  extern struct file_list *the_file_list;
  extern struct filter_list_struct server_filter_list;
  
- static int deletion_count = 0; /* used to implement --max-delete */
+@@ -99,10 +102,14 @@ static int deletion_count = 0; /* used t
+ #define DEL_TERSE             (1<<3)
  
  
 +/* Function now compares both backup_suffix and backup_suffix_dels. */
@@ -133,7 +134,7 @@ Marc St-Onge
  }
  
  
-@@ -114,8 +121,8 @@ static int delete_item(char *fname, int 
+@@ -123,8 +130,8 @@ static int delete_item(char *fname, int 
        if (!S_ISDIR(mode)) {
                if (max_delete && ++deletion_count > max_delete)
                        return 0;
@@ -144,7 +145,7 @@ Marc St-Onge
                else
                        ok = robust_unlink(fname) == 0;
                if (ok) {
-@@ -138,9 +145,9 @@ static int delete_item(char *fname, int 
+@@ -146,9 +153,9 @@ static int delete_item(char *fname, int 
            || (dry_run && zap_dir)) {
                ok = 0;
                errno = ENOTEMPTY;
@@ -156,9 +157,9 @@ Marc St-Onge
        else
                ok = do_rmdir(fname) == 0;
        if (ok) {
---- orig/options.c     2005-11-07 04:29:01
+--- orig/options.c     2005-11-15 07:01:03
 +++ options.c  2005-11-07 04:35:54
-@@ -131,10 +131,14 @@ int no_detach
+@@ -132,10 +132,14 @@ int no_detach
  int write_batch = 0;
  int read_batch = 0;
  int backup_dir_len = 0;
@@ -173,7 +174,7 @@ Marc St-Onge
  char *tmpdir = NULL;
  char *partial_dir = NULL;
  char *basis_dir[MAX_BASIS_DIRS+1];
-@@ -145,7 +149,9 @@ char *password_file = NULL;
+@@ -146,7 +150,9 @@ char *password_file = NULL;
  char *rsync_path = RSYNC_PATH;
  char *backup_dir = NULL;
  char *chmod_mode = NULL;
@@ -183,7 +184,7 @@ Marc St-Onge
  int rsync_port = 0;
  int compare_dest = 0;
  int copy_dest = 0;
-@@ -278,6 +284,8 @@ void usage(enum logcode F)
+@@ -279,6 +285,8 @@ void usage(enum logcode F)
    rprintf(F," -b, --backup                make backups (see --suffix & --backup-dir)\n");
    rprintf(F,"     --backup-dir=DIR        make backups into hierarchy based in DIR\n");
    rprintf(F,"     --suffix=SUFFIX         set backup suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX);
@@ -192,7 +193,7 @@ Marc St-Onge
    rprintf(F," -u, --update                skip files that are newer on the receiver\n");
    rprintf(F,"     --inplace               update destination files in-place (SEE MAN PAGE)\n");
    rprintf(F,"     --append                append data onto shorter files\n");
-@@ -473,7 +481,9 @@ static struct poptOption long_options[] 
+@@ -478,7 +486,9 @@ static struct poptOption long_options[] 
    {"bwlimit",          0,  POPT_ARG_INT,    &bwlimit, 0, 0, 0 },
    {"backup",          'b', POPT_ARG_NONE,   &make_backups, 0, 0, 0 },
    {"backup-dir",       0,  POPT_ARG_STRING, &backup_dir, 0, 0, 0 },
@@ -202,7 +203,7 @@ Marc St-Onge
    {"list-only",        0,  POPT_ARG_VAL,    &list_only, 2, 0, 0 },
    {"read-batch",       0,  POPT_ARG_STRING, &batch_name, OPT_READ_BATCH, 0, 0 },
    {"write-batch",      0,  POPT_ARG_STRING, &batch_name, OPT_WRITE_BATCH, 0, 0 },
-@@ -1131,6 +1141,8 @@ int parse_arguments(int *argc, const cha
+@@ -1139,6 +1149,8 @@ int parse_arguments(int *argc, const cha
                        partial_dir = sanitize_path(NULL, partial_dir, NULL, 0);
                if (backup_dir)
                        backup_dir = sanitize_path(NULL, backup_dir, NULL, 0);
@@ -211,7 +212,7 @@ Marc St-Onge
        }
        if (server_filter_list.head && !am_sender) {
                struct filter_list_struct *elp = &server_filter_list;
-@@ -1165,6 +1177,14 @@ int parse_arguments(int *argc, const cha
+@@ -1173,6 +1185,14 @@ int parse_arguments(int *argc, const cha
                                return 0;
                        }
                }
@@ -226,7 +227,7 @@ Marc St-Onge
        }
  
        if (!backup_suffix)
-@@ -1176,6 +1196,16 @@ int parse_arguments(int *argc, const cha
+@@ -1184,6 +1204,16 @@ int parse_arguments(int *argc, const cha
                        backup_suffix);
                return 0;
        }
@@ -243,7 +244,7 @@ Marc St-Onge
        if (backup_dir) {
                backup_dir_len = strlcpy(backup_dir_buf, backup_dir, sizeof backup_dir_buf);
                backup_dir_remainder = sizeof backup_dir_buf - backup_dir_len;
-@@ -1197,6 +1227,31 @@ int parse_arguments(int *argc, const cha
+@@ -1205,6 +1235,31 @@ int parse_arguments(int *argc, const cha
                        "--suffix cannot be a null string without --backup-dir\n");
                return 0;
        }
@@ -275,7 +276,7 @@ Marc St-Onge
        if (make_backups && !backup_dir)
                omit_dir_times = 1;
  
-@@ -1519,6 +1574,10 @@ void server_options(char **args,int *arg
+@@ -1527,6 +1582,10 @@ void server_options(char **args,int *arg
                args[ac++] = "--backup-dir";
                args[ac++] = backup_dir;
        }
@@ -286,7 +287,7 @@ Marc St-Onge
  
        /* Only send --suffix if it specifies a non-default value. */
        if (strcmp(backup_suffix, backup_dir ? "" : BACKUP_SUFFIX) != 0) {
-@@ -1527,7 +1586,13 @@ void server_options(char **args,int *arg
+@@ -1535,7 +1594,13 @@ void server_options(char **args,int *arg
                        goto oom;
                args[ac++] = arg;
        }