Fixed a variable and a function that changed names.

diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff
index 5ed084f..0a0729a 100644 (file)
--- a/backup-dir-dels.diff
+++ b/backup-dir-dels.diff
@@ -105,9 +105,9 @@ Marc St-Onge
 +      deleting = 0;
 +      return ret;
 +}
---- orig/options.c     2005-02-20 00:02:23
-+++ options.c  2005-01-28 19:17:35
-@@ -119,10 +119,14 @@ int no_detach = 0;
+--- orig/options.c     2005-02-20 01:12:42
++++ options.c  2005-02-20 03:09:33
+@@ -121,10 +121,14 @@ int no_detach = 0;
  int write_batch = 0;
  int read_batch = 0;
  int backup_dir_len = 0;
@@ -122,7 +122,7 @@ Marc St-Onge
  char *tmpdir = NULL;
  char *partial_dir = NULL;
  char *basis_dir[MAX_BASIS_DIRS+1];
-@@ -132,7 +136,9 @@ char *log_format = NULL;
+@@ -134,7 +138,9 @@ char *log_format = NULL;
  char *password_file = NULL;
  char *rsync_path = RSYNC_PATH;
  char *backup_dir = NULL;
@@ -132,7 +132,7 @@ Marc St-Onge
  int rsync_port = 0;
  int compare_dest = 0;
  int copy_dest = 0;
-@@ -263,6 +269,8 @@ void usage(enum logcode F)
+@@ -265,6 +271,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);
@@ -141,7 +141,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," -d, --dirs                  transfer directories without recursing\n");
-@@ -357,6 +365,7 @@ static struct poptOption long_options[] 
+@@ -360,6 +368,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 },
@@ -149,7 +149,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 },
-@@ -436,6 +445,7 @@ static struct poptOption long_options[] 
+@@ -440,6 +449,7 @@ static struct poptOption long_options[] 
    {"itemize-changes", 'i', POPT_ARG_NONE,   &itemize_changes, 0, 0, 0 },
    {"bwlimit",          0,  POPT_ARG_INT,    &bwlimit, 0, 0, 0 },
    {"backup-dir",       0,  POPT_ARG_STRING, &backup_dir, 0, 0, 0 },
@@ -157,7 +157,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 },
-@@ -991,6 +1001,8 @@ int parse_arguments(int *argc, const cha
+@@ -1006,6 +1016,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);
@@ -166,20 +166,20 @@ Marc St-Onge
                if (files_from)
                        files_from = sanitize_path(NULL, files_from, NULL, 0);
        }
-@@ -1023,6 +1035,12 @@ int parse_arguments(int *argc, const cha
+@@ -1038,6 +1050,12 @@ int parse_arguments(int *argc, const cha
                        if (check_filter(elp, backup_dir, 1) < 0)
                                goto options_rejected;
                }
 +              /* Clean backup_dir_rm same as for backup_dir */
 +              if (backup_dir_rm) {
 +                      clean_fname(backup_dir_rm, 1);
-+                      if (check_exclude(elp, backup_dir_rm, 1) < 0)
++                      if (check_filter(elp, backup_dir_rm, 1) < 0)
 +                              goto options_rejected;
 +              }
        }
        if (server_filter_list.head && files_from) {
                if (!*files_from)
-@@ -1045,6 +1063,16 @@ int parse_arguments(int *argc, const cha
+@@ -1060,6 +1078,16 @@ int parse_arguments(int *argc, const cha
                        backup_suffix);
                return 0;
        }
@@ -196,7 +196,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;
-@@ -1066,6 +1094,31 @@ int parse_arguments(int *argc, const cha
+@@ -1081,6 +1109,31 @@ int parse_arguments(int *argc, const cha
                        "--suffix cannot be a null string without --backup-dir\n");
                return 0;
        }
@@ -228,7 +228,7 @@ Marc St-Onge
  
        if (log_format) {
                if (strstr(log_format, "%i") != NULL)
-@@ -1329,6 +1382,10 @@ void server_options(char **args,int *arg
+@@ -1344,6 +1397,10 @@ void server_options(char **args,int *arg
                args[ac++] = "--backup-dir";
                args[ac++] = backup_dir;
        }
@@ -239,7 +239,7 @@ Marc St-Onge
  
        /* Only send --suffix if it specifies a non-default value. */
        if (strcmp(backup_suffix, backup_dir ? "" : BACKUP_SUFFIX) != 0) {
-@@ -1337,7 +1394,13 @@ void server_options(char **args,int *arg
+@@ -1352,7 +1409,13 @@ void server_options(char **args,int *arg
                        goto oom;
                args[ac++] = arg;
        }
@@ -255,7 +255,7 @@ Marc St-Onge
                if (delete_excluded)
                        args[ac++] = "--delete-excluded";
 --- orig/rsync.c       2005-02-20 00:02:23
-+++ rsync.c    2005-02-20 00:05:49
++++ rsync.c    2005-02-20 03:08:42
 @@ -44,12 +44,19 @@ extern char *backup_dir;
  extern char *log_format;
  extern char *backup_suffix;
@@ -283,7 +283,7 @@ Marc St-Onge
                int ok;
 -              if (make_backups && (backup_dir || !is_backup_file(fname)))
 -                      ok = make_backup(fname);
-+              int backup_file = is_backup_file(f);
++              int backup_file = is_backup_file(fname);
 +              if (make_backups && (backup_dir_rm || !backup_file))
 +                      ok = safe_delete(fname);
                else