--- old/backup.c
+++ new/backup.c
-@@ -28,10 +28,17 @@ extern int preserve_specials;
+@@ -29,10 +29,17 @@ extern int preserve_specials;
extern int preserve_links;
extern int safe_symlinks;
extern int backup_dir_len;
/* make a complete pathname for backup file */
char *get_backup_name(const char *fname)
-@@ -50,11 +57,28 @@ char *get_backup_name(const char *fname)
+@@ -51,11 +58,28 @@ char *get_backup_name(const char *fname)
return NULL;
}
if (!fnamebak)
return 0;
-@@ -95,7 +119,8 @@ static int make_bak_dir(char *fullpath)
+@@ -96,7 +120,7 @@ int make_bak_dir(const char *fullpath)
{
- statx sx;
+ char fbuf[MAXPATHLEN], *rel, *end, *p;
struct file_struct *file;
-- char *rel = fullpath + backup_dir_len;
-+ int dir_len = deleting ? backup_dir_dels_len : backup_dir_len;
-+ char *rel = fullpath + dir_len;
- char *end = rel + strlen(rel);
- char *p = end;
+- int len = backup_dir_len;
++ int len = deleting ? backup_dir_dels_len : backup_dir_len;
+ stat_x sx;
-@@ -198,7 +223,8 @@ static int keep_backup(const char *fname
+ while (*fullpath == '.' && fullpath[1] == '/') {
+@@ -211,7 +235,8 @@ static int keep_backup(const char *fname
if (!(file = make_file(fname, NULL, NULL, 0, NO_FILTERS)))
return 1; /* the file could have disappeared */
unmake_file(file);
return 0;
}
-@@ -306,3 +332,13 @@ int make_backup(const char *fname)
+@@ -326,3 +351,13 @@ int make_backup(const char *fname)
return keep_backup(fname);
return make_simple_backup(fname);
}
+}
--- old/generator.c
+++ new/generator.c
-@@ -94,6 +94,9 @@ extern mode_t orig_umask;
+@@ -93,6 +93,9 @@ extern mode_t orig_umask;
extern char *backup_dir;
extern char *backup_suffix;
extern int backup_suffix_len;
+extern int backup_suffix_dels_len;
extern struct file_list *cur_flist, *first_flist, *dir_flist;
extern struct filter_list_struct server_filter_list;
-
-@@ -127,10 +130,14 @@ enum delret {
+ #ifdef ICONV_OPTION
+@@ -130,10 +133,14 @@ enum delret {
static enum delret delete_dir_contents(char *fname, int flags);
}
/* Delete a file or directory. If DEL_RECURSE is set in the flags, this will
-@@ -166,9 +173,9 @@ static enum delret delete_item(char *fbu
+@@ -169,9 +176,9 @@ static enum delret delete_item(char *fbu
if (S_ISDIR(mode)) {
what = "rmdir";
ok = do_rmdir(fbuf) == 0;
ok = robust_unlink(fbuf) == 0;
--- old/options.c
+++ new/options.c
-@@ -137,10 +137,14 @@ int no_detach
+@@ -147,10 +147,14 @@ int no_detach
int write_batch = 0;
int read_batch = 0;
int backup_dir_len = 0;
char *tmpdir = NULL;
char *partial_dir = NULL;
char *basis_dir[MAX_BASIS_DIRS+1];
-@@ -152,7 +156,9 @@ char *stdout_format = NULL;
+@@ -162,7 +166,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;
-@@ -293,6 +299,8 @@ void usage(enum logcode F)
+@@ -318,6 +324,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");
-@@ -527,7 +535,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 },
+@@ -588,7 +596,9 @@ static struct poptOption long_options[]
+ {"backup", 'b', POPT_ARG_VAL, &make_backups, 1, 0, 0 },
+ {"no-backup", 0, POPT_ARG_VAL, &make_backups, 0, 0, 0 },
{"backup-dir", 0, POPT_ARG_STRING, &backup_dir, 0, 0, 0 },
+ {"backup-dir-dels", 0, POPT_ARG_STRING, &backup_dir_dels, 0, 0, 0 },
{"suffix", 0, POPT_ARG_STRING, &backup_suffix, 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 },
-@@ -1271,6 +1281,8 @@ int parse_arguments(int *argc, const cha
+@@ -1400,6 +1410,8 @@ int parse_arguments(int *argc_p, const c
tmpdir = sanitize_path(NULL, tmpdir, NULL, 0, NULL);
if (backup_dir)
backup_dir = sanitize_path(NULL, backup_dir, NULL, 0, NULL);
}
if (server_filter_list.head && !am_sender) {
struct filter_list_struct *elp = &server_filter_list;
-@@ -1288,6 +1300,14 @@ int parse_arguments(int *argc, const cha
+@@ -1417,6 +1429,14 @@ int parse_arguments(int *argc_p, const c
if (check_filter(elp, backup_dir, 1) < 0)
goto options_rejected;
}
}
if (!backup_suffix)
-@@ -1299,6 +1319,16 @@ int parse_arguments(int *argc, const cha
+@@ -1428,6 +1448,16 @@ int parse_arguments(int *argc_p, const c
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;
-@@ -1322,6 +1352,31 @@ int parse_arguments(int *argc, const cha
+@@ -1451,6 +1481,31 @@ int parse_arguments(int *argc_p, const c
"P *%s", backup_suffix);
- parse_rule(&filter_list, backup_dir_buf, 0, 0);
+ parse_rule(&filter_list, backup_dir_buf, 0, 0);
}
+ /* If backup_dir_dels not supplied default to backup_dir if it has been supplied */
+ if (backup_dir && !backup_dir_dels) {
+ "--suffix-dels cannot be a null string without --backup-dir-dels\n");
+ return 0;
+ }
- if (make_backups && !backup_dir)
- omit_dir_times = 1;
-@@ -1689,6 +1744,10 @@ void server_options(char **args,int *arg
+ if (make_backups && !backup_dir) {
+ omit_dir_times = 0; /* Implied, so avoid -O to sender. */
+@@ -1845,6 +1900,10 @@ void server_options(char **args, int *ar
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) {
-@@ -1697,7 +1756,13 @@ void server_options(char **args,int *arg
+@@ -1853,7 +1912,13 @@ void server_options(char **args, int *ar
goto oom;
args[ac++] = arg;
}
+ args[ac++] = arg;
+ }
if (am_sender) {
- if (delete_before)
- args[ac++] = "--delete-before";
+ if (max_delete > 0) {
+ if (asprintf(&arg, "--max-delete=%d", max_delete) < 0)
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff