Fixed failing hunk.

[rsync/rsync-patches.git] / backup-dir-dels.diff

diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff
index 362630e..1fdc4c0 100644 (file)
--- a/backup-dir-dels.diff
+++ b/backup-dir-dels.diff
@@ -106,7 +106,7 @@ Marc St-Onge
 +      deleting = 0;
 +      return ret;
 +}
---- orig/options.c     2004-11-27 18:27:35
+--- orig/options.c     2005-01-17 23:11:45
 +++ options.c  2004-11-27 18:37:18
 @@ -115,10 +115,14 @@ int no_detach = 0;
  int write_batch = 0;
@@ -131,8 +131,8 @@ Marc St-Onge
  char backup_dir_buf[MAXPATHLEN];
 +char delete_dir_buf[MAXPATHLEN];
  int rsync_port = 0;
+ int compare_dest = 0;
  int copy_dest = 0;
- int link_dest = 0;
 @@ -246,7 +252,9 @@ void usage(enum logcode F)
    rprintf(F,"     --no-implied-dirs       don't send implied dirs with -R\n");
    rprintf(F," -b, --backup                make backups (see --suffix & --backup-dir)\n");
@@ -141,9 +141,9 @@ Marc St-Onge
    rprintf(F,"     --suffix=SUFFIX         backup suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX);
 +  rprintf(F,"     --delete-suffix=SUFFIX  deleted files suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX);
    rprintf(F," -u, --update                update only (don't overwrite newer files)\n");
-   rprintf(F,"     --inplace               update destination files inplace (SEE MAN PAGE)\n");
+   rprintf(F,"     --inplace               update destination files in-place (SEE MAN PAGE)\n");
    rprintf(F," -K, --keep-dirlinks         treat symlinked dir on receiver as dir\n");
-@@ -329,6 +337,7 @@ static struct poptOption long_options[] 
+@@ -330,6 +338,7 @@ static struct poptOption long_options[] 
    /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
    {"version",          0,  POPT_ARG_NONE,   0, OPT_VERSION, 0, 0},
    {"suffix",           0,  POPT_ARG_STRING, &backup_suffix, 0, 0, 0 },
@@ -151,7 +151,7 @@ Marc St-Onge
    {"rsync-path",       0,  POPT_ARG_STRING, &rsync_path, 0, 0, 0 },
    {"password-file",    0,  POPT_ARG_STRING, &password_file, 0, 0, 0 },
    {"ignore-times",    'I', POPT_ARG_NONE,   &ignore_times, 0, 0, 0 },
-@@ -396,6 +405,7 @@ static struct poptOption long_options[] 
+@@ -398,6 +407,7 @@ static struct poptOption long_options[] 
    {"log-format",       0,  POPT_ARG_STRING, &log_format, 0, 0, 0 },
    {"bwlimit",          0,  POPT_ARG_INT,    &bwlimit, 0, 0, 0 },
    {"backup-dir",       0,  POPT_ARG_STRING, &backup_dir, 0, 0, 0 },
@@ -159,7 +159,7 @@ Marc St-Onge
    {"hard-links",      'H', POPT_ARG_NONE,   &preserve_hard_links, 0, 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 },
-@@ -866,6 +876,8 @@ int parse_arguments(int *argc, const cha
+@@ -867,6 +877,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);
@@ -168,7 +168,7 @@ Marc St-Onge
                if (files_from)
                        files_from = sanitize_path(NULL, files_from, NULL, 0);
        }
-@@ -892,6 +904,12 @@ int parse_arguments(int *argc, const cha
+@@ -893,6 +905,12 @@ int parse_arguments(int *argc, const cha
                        if (check_exclude(elp, backup_dir, 1) < 0)
                                goto options_rejected;
                }
@@ -181,7 +181,7 @@ Marc St-Onge
        }
        if (server_exclude_list.head && files_from) {
                clean_fname(files_from, 1);
-@@ -912,6 +930,16 @@ int parse_arguments(int *argc, const cha
+@@ -913,6 +931,16 @@ int parse_arguments(int *argc, const cha
                        backup_suffix);
                return 0;
        }
@@ -198,7 +198,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;
-@@ -931,6 +959,31 @@ int parse_arguments(int *argc, const cha
+@@ -932,6 +960,31 @@ int parse_arguments(int *argc, const cha
                        "--suffix cannot be a null string without --backup-dir\n");
                return 0;
        }
@@ -230,7 +230,7 @@ Marc St-Onge
  
        if (do_progress && !verbose)
                verbose = 1;
-@@ -1144,6 +1197,10 @@ void server_options(char **args,int *arg
+@@ -1139,6 +1192,10 @@ void server_options(char **args,int *arg
                args[ac++] = "--backup-dir";
                args[ac++] = backup_dir;
        }
@@ -241,7 +241,7 @@ Marc St-Onge
  
        /* Only send --suffix if it specifies a non-default value. */
        if (strcmp(backup_suffix, backup_dir ? "" : BACKUP_SUFFIX) != 0) {
-@@ -1152,7 +1209,13 @@ void server_options(char **args,int *arg
+@@ -1147,7 +1204,13 @@ void server_options(char **args,int *arg
                        goto oom;
                args[ac++] = arg;
        }
@@ -256,9 +256,9 @@ Marc St-Onge
        if (am_sender) {
                if (delete_excluded)
                        args[ac++] = "--delete-excluded";
---- orig/receiver.c    2004-11-27 17:57:31
+--- orig/receiver.c    2005-01-17 23:11:45
 +++ receiver.c 2004-11-03 23:10:06
-@@ -43,8 +43,11 @@ extern char *basis_dir[];
+@@ -44,8 +44,11 @@ extern int basis_dir_cnt;
  extern int make_backups;
  extern int do_progress;
  extern char *backup_dir;
@@ -270,7 +270,7 @@ Marc St-Onge
  extern int cleanup_got_literal;
  extern int module_id;
  extern int ignore_errors;
-@@ -78,11 +81,14 @@ static void delete_one(char *fn, int is_
+@@ -79,11 +82,14 @@ static void delete_one(char *fn, int is_
        }
  }
  
@@ -287,7 +287,7 @@ Marc St-Onge
  }
  
  
-@@ -124,11 +130,12 @@ void delete_files(struct file_list *flis
+@@ -125,11 +131,12 @@ void delete_files(struct file_list *flis
                        if (flist_find(flist,local_file_list->files[i]) < 0) {
                                char *f = f_name(local_file_list->files[i]);
                                int mode = local_file_list->files[i]->mode;