Marc St-Onge
+To use this patch, run these commands for a successful build:
+
+ patch -p1 <patches/backup-dir-dels.diff
+ ./configure (optional if already run)
+ make
+
--- old/backup.c
+++ new/backup.c
-@@ -22,11 +22,17 @@
+@@ -23,10 +23,15 @@
extern int verbose;
- extern int backup_suffix_len;
-+extern int backup_suffix_dels_len;
extern int backup_dir_len;
+extern int backup_dir_dels_len;
extern unsigned int backup_dir_remainder;
extern int am_root;
extern int preserve_devices;
-@@ -36,6 +42,8 @@ extern int preserve_hard_links;
- extern int orig_umask;
+@@ -34,6 +39,8 @@ extern int preserve_specials;
+ extern int preserve_links;
extern int safe_symlinks;
+static int deleting;
/* make a complete pathname for backup file */
char *get_backup_name(char *fname)
{
-@@ -53,11 +61,28 @@ char *get_backup_name(char *fname)
+@@ -51,11 +58,28 @@ char *get_backup_name(char *fname)
return NULL;
}
if (!fnamebak)
return 0;
-@@ -97,7 +122,8 @@ path
+@@ -95,7 +119,8 @@ path
static int make_bak_dir(char *fullpath)
{
STRUCT_STAT st;
char *end = rel + strlen(rel);
char *p = end;
-@@ -185,7 +211,8 @@ static int keep_backup(char *fname)
+@@ -183,7 +208,8 @@ static int keep_backup(char *fname)
if (!(file = make_file(fname, NULL, NULL, 0, NO_FILTERS)))
return 1; /* the file could have disappeared */
return 0;
/* Check to see if this is a device file, or link */
-@@ -280,3 +307,13 @@ int make_backup(char *fname)
+@@ -278,3 +304,13 @@ int make_backup(char *fname)
return keep_backup(fname);
return make_simple_backup(fname);
}
+}
--- old/generator.c
+++ new/generator.c
-@@ -91,6 +91,9 @@ extern dev_t filesystem_dev;
+@@ -90,6 +90,9 @@ extern dev_t filesystem_dev;
extern char *backup_dir;
extern char *backup_suffix;
extern int backup_suffix_len;
extern struct file_list *the_file_list;
extern struct filter_list_struct server_filter_list;
-@@ -103,10 +106,14 @@ static int can_link_devices = 1;
+@@ -100,10 +103,14 @@ static int deletion_count = 0; /* used t
#define DEL_TERSE (1<<3)
}
-@@ -127,8 +134,8 @@ static int delete_item(char *fname, int
+@@ -124,8 +131,8 @@ static int delete_item(char *fname, int
if (!S_ISDIR(mode)) {
if (max_delete && ++deletion_count > max_delete)
return 0;
else
ok = robust_unlink(fname) == 0;
if (ok) {
-@@ -150,9 +157,9 @@ static int delete_item(char *fname, int
+@@ -147,9 +154,9 @@ static int delete_item(char *fname, int
|| (dry_run && zap_dir)) {
ok = 0;
errno = ENOTEMPTY;
char *tmpdir = NULL;
char *partial_dir = NULL;
char *basis_dir[MAX_BASIS_DIRS+1];
-@@ -151,7 +155,9 @@ char *log_format = NULL;
+@@ -153,7 +157,9 @@ char *stdout_format = NULL;
char *password_file = NULL;
char *rsync_path = RSYNC_PATH;
char *backup_dir = NULL;
char *sockopts = NULL;
int rsync_port = 0;
int compare_dest = 0;
-@@ -282,6 +288,8 @@ void usage(enum logcode F)
+@@ -292,6 +298,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);
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");
-@@ -496,7 +504,9 @@ static struct poptOption long_options[]
+@@ -518,7 +526,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 },
{"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 },
-@@ -1205,6 +1215,8 @@ int parse_arguments(int *argc, const cha
- partial_dir = sanitize_path(NULL, partial_dir, NULL, 0);
+@@ -1232,6 +1242,8 @@ int parse_arguments(int *argc, const cha
+ tmpdir = sanitize_path(NULL, tmpdir, NULL, 0, NULL);
if (backup_dir)
- backup_dir = sanitize_path(NULL, backup_dir, NULL, 0);
-+ if (backup_dir_dels)
-+ backup_dir_dels = sanitize_path(NULL, backup_dir_dels, NULL, 0);
+ backup_dir = sanitize_path(NULL, backup_dir, NULL, 0, NULL);
++ if (backup_dir_dels)
++ backup_dir_dels = sanitize_path(NULL, backup_dir_dels, NULL, 0, NULL);
}
if (server_filter_list.head && !am_sender) {
struct filter_list_struct *elp = &server_filter_list;
-@@ -1239,6 +1251,14 @@ int parse_arguments(int *argc, const cha
+@@ -1253,6 +1265,14 @@ int parse_arguments(int *argc, const cha
return 0;
}
}
}
if (!backup_suffix)
-@@ -1250,6 +1270,16 @@ int parse_arguments(int *argc, const cha
+@@ -1264,6 +1284,16 @@ int parse_arguments(int *argc, const cha
backup_suffix);
return 0;
}
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;
-@@ -1273,6 +1303,31 @@ int parse_arguments(int *argc, const cha
+@@ -1287,6 +1317,31 @@ int parse_arguments(int *argc, const cha
"P *%s", backup_suffix);
parse_rule(&filter_list, backup_dir_buf, 0, 0);
}
if (make_backups && !backup_dir)
omit_dir_times = 1;
-@@ -1614,6 +1669,10 @@ void server_options(char **args,int *arg
+@@ -1646,6 +1701,10 @@ void server_options(char **args,int *arg
args[ac++] = "--backup-dir";
args[ac++] = backup_dir;
}
/* Only send --suffix if it specifies a non-default value. */
if (strcmp(backup_suffix, backup_dir ? "" : BACKUP_SUFFIX) != 0) {
-@@ -1622,7 +1681,13 @@ void server_options(char **args,int *arg
+@@ -1654,7 +1713,13 @@ void server_options(char **args,int *arg
goto oom;
args[ac++] = arg;
}