X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/9a7eef964a2e3389ffd3537302f80ca42cfe9239..0ef5abcbbb95298fa9faf1d3eb275a9e76e1d951:/backup-dir-dels.diff diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff index acac0f1..3919e07 100644 --- a/backup-dir-dels.diff +++ b/backup-dir-dels.diff @@ -13,13 +13,18 @@ suffix. Marc St-Onge ---- old/backup.c -+++ new/backup.c -@@ -22,11 +22,17 @@ - - extern int verbose; - extern int backup_suffix_len; -+extern int backup_suffix_dels_len; +To use this patch, run these commands for a successful build: + + patch -p1 0 && strcmp(fn+k, backup_suffix_dels) == 0; } - -@@ -127,8 +134,8 @@ static int delete_item(char *fname, int - if (!S_ISDIR(mode)) { - if (max_delete && ++deletion_count > max_delete) - return 0; -- if (make_backups && (backup_dir || !is_backup_file(fname))) -- ok = make_backup(fname); -+ if (make_backups && (backup_dir_dels || !is_backup_file(fname))) -+ ok = safe_delete(fname); - else - ok = robust_unlink(fname) == 0; - if (ok) { -@@ -150,9 +157,9 @@ static int delete_item(char *fname, int - || (dry_run && zap_dir)) { - ok = 0; - errno = ENOTEMPTY; -- } else if (make_backups && !backup_dir && !is_backup_file(fname) -+ } else if (make_backups && !backup_dir_dels && !is_backup_file(fname) - && !(flags & DEL_FORCE_RECURSE)) -- ok = make_backup(fname); -+ ok = safe_delete(fname); - else - ok = do_rmdir(fname) == 0; - if (ok) { ---- old/options.c -+++ new/options.c -@@ -137,10 +137,14 @@ int no_detach + /* Delete a file or directory. If DEL_RECURSE is set in the flags, this will +@@ -193,9 +201,9 @@ static enum delret delete_item(char *fbuf, uint16 mode, uint16 flags) + if (S_ISDIR(mode)) { + what = "rmdir"; + ok = do_rmdir(fbuf) == 0; +- } else if (make_backups > 0 && (backup_dir || !is_backup_file(fbuf))) { ++ } else if (make_backups > 0 && (backup_dir_dels || !is_backup_file(fbuf))) { + what = "make_backup"; +- ok = make_backup(fbuf); ++ ok = safe_delete(fbuf); + } else { + what = "unlink"; + ok = robust_unlink(fbuf) == 0; +diff --git a/options.c b/options.c +--- a/options.c ++++ b/options.c +@@ -150,10 +150,14 @@ int no_detach int write_batch = 0; int read_batch = 0; int backup_dir_len = 0; -+int backup_dir_dels_len = 0; ++int backup_dir_dels_len = 0; int backup_suffix_len; +int backup_suffix_dels_len; unsigned int backup_dir_remainder; @@ -174,7 +168,7 @@ Marc St-Onge char *tmpdir = NULL; char *partial_dir = NULL; char *basis_dir[MAX_BASIS_DIRS+1]; -@@ -150,7 +154,9 @@ char *log_format = NULL; +@@ -165,7 +169,9 @@ char *stdout_format = NULL; char *password_file = NULL; char *rsync_path = RSYNC_PATH; char *backup_dir = NULL; @@ -184,18 +178,18 @@ Marc St-Onge char *sockopts = NULL; int rsync_port = 0; int compare_dest = 0; -@@ -281,6 +287,8 @@ void usage(enum logcode F) +@@ -326,6 +332,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," --backup-dir-dels make backups of removed files into current dir\n"); -+ rprintf(F," --suffix-dels=SUFFIX set removed-files suffix (defaults to --suffix)\n"); ++ rprintf(F," --backup-dir-dels=DIR backup removed files into hierarchy based in DIR\n"); ++ rprintf(F," --suffix-dels=SUFFIX set removed-files suffix (def. --suffix w/o b-d-d)\n"); 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"); -@@ -494,7 +502,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 }, +@@ -610,7 +618,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 }, @@ -203,58 +197,56 @@ 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 }, -@@ -1202,6 +1212,8 @@ int parse_arguments(int *argc, const cha - partial_dir = sanitize_path(NULL, partial_dir, NULL, 0); +@@ -1454,6 +1464,8 @@ int parse_arguments(int *argc_p, const char ***argv_p) + tmpdir = sanitize_path(NULL, tmpdir, NULL, 0, SP_DEFAULT); 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, SP_DEFAULT); ++ if (backup_dir_dels) ++ backup_dir_dels = sanitize_path(NULL, backup_dir_dels, NULL, 0, SP_DEFAULT); } - if (server_filter_list.head && !am_sender) { - struct filter_list_struct *elp = &server_filter_list; -@@ -1236,6 +1248,14 @@ int parse_arguments(int *argc, const cha - return 0; - } + if (daemon_filter_list.head && !am_sender) { + struct filter_list_struct *elp = &daemon_filter_list; +@@ -1475,6 +1487,14 @@ int parse_arguments(int *argc_p, const char ***argv_p) + if (check_filter(elp, FLOG, dir, 1) < 0) + goto options_rejected; } + /* Clean backup_dir_dels same as for backup_dir */ + if (backup_dir_dels) { + if (!*backup_dir_dels) + goto options_rejected; + clean_fname(backup_dir_dels, 1); -+ if (check_filter(elp, backup_dir_dels, 1) < 0) ++ if (check_filter(elp, FLOG, backup_dir_dels, 1) < 0) + goto options_rejected; + } } if (!backup_suffix) -@@ -1247,6 +1267,16 @@ int parse_arguments(int *argc, const cha +@@ -1486,6 +1506,20 @@ int parse_arguments(int *argc_p, const char ***argv_p) backup_suffix); return 0; } -+ /* if backup_suffix_dels not supplied, default to backup_suffix */ ++ /* --suffix-dels defaults to --suffix, or empty for a client given an ++ * explicit --backup-dir-dels (just as --suffix defaults to empty when ++ * a --backup-dir is given). The second case does not apply to the ++ * server for consistency with server_options, which sends --suffix-dels ++ * to the server iff it differs from --suffix. */ + if (!backup_suffix_dels) -+ backup_suffix_dels = backup_dir_dels ? "" : backup_suffix; ++ backup_suffix_dels = backup_dir_dels && !am_server ? "" : backup_suffix; + backup_suffix_dels_len = strlen(backup_suffix_dels); + if (strchr(backup_suffix_dels, '/') != NULL) { + snprintf(err_buf, sizeof err_buf, + "--suffix-dels cannot contain slashes: %s\n", -+ backup_suffix_dels); ++ backup_suffix_dels); + 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; -@@ -1270,6 +1300,31 @@ int parse_arguments(int *argc, const cha +@@ -1509,6 +1543,34 @@ int parse_arguments(int *argc_p, const char ***argv_p) "P *%s", backup_suffix); 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) { -+ backup_dir_dels = backup_dir; -+ backup_dir_dels_len = backup_dir_len; -+ backup_dir_dels_remainder = backup_dir_remainder; -+ strlcpy(backup_dir_dels_buf, backup_dir_buf, sizeof backup_dir_buf); -+ } else if (backup_dir_dels) { ++ if (backup_dir_dels) { + backup_dir_dels_len = strlcpy(backup_dir_dels_buf, backup_dir_dels, sizeof backup_dir_dels_buf); + backup_dir_dels_remainder = sizeof backup_dir_dels_buf - backup_dir_dels_len; + if (backup_dir_dels_remainder < 32) { @@ -268,15 +260,24 @@ Marc St-Onge + } + if (verbose > 1 && !am_sender) + rprintf(FINFO, "backup_dir_dels is %s\n", backup_dir_dels_buf); ++ } else if (backup_dir) { ++ backup_dir_dels = backup_dir; ++ backup_dir_dels_len = backup_dir_len; ++ backup_dir_dels_remainder = backup_dir_remainder; ++ strlcpy(backup_dir_dels_buf, backup_dir_buf, sizeof backup_dir_buf); + } else if (!backup_suffix_dels_len && (!am_server || !am_sender)) { + snprintf(err_buf, sizeof err_buf, + "--suffix-dels cannot be a null string without --backup-dir-dels\n"); + return 0; ++ } else if (make_backups && delete_mode && !delete_excluded && !am_server) { ++ snprintf(backup_dir_dels_buf, sizeof backup_dir_dels_buf, ++ "P *%s", backup_suffix_dels); ++ parse_rule(&filter_list, backup_dir_dels_buf, 0, 0); + } - if (make_backups && !backup_dir) - omit_dir_times = 1; -@@ -1612,6 +1667,10 @@ void server_options(char **args,int *arg + if (make_backups && !backup_dir) { + omit_dir_times = 0; /* Implied, so avoid -O to sender. */ +@@ -1917,6 +1979,10 @@ void server_options(char **args, int *argc_p) args[ac++] = "--backup-dir"; args[ac++] = backup_dir; } @@ -287,18 +288,19 @@ Marc St-Onge /* Only send --suffix if it specifies a non-default value. */ if (strcmp(backup_suffix, backup_dir ? "" : BACKUP_SUFFIX) != 0) { -@@ -1620,7 +1679,13 @@ void server_options(char **args,int *arg +@@ -1925,7 +1991,14 @@ void server_options(char **args, int *argc_p) goto oom; args[ac++] = arg; } - -+ /* Only send --suffix-dels if it specifies a non-default value. */ -+ if (strcmp(backup_suffix_dels, backup_dir_dels ? "" : BACKUP_SUFFIX) != 0) { ++ /* Only send --suffix-dels if it specifies a value different from the ++ * --suffix value, which would normally be used for deletions too. */ ++ if (strcmp(backup_suffix_dels, backup_suffix) != 0) { + /* We use the following syntax to avoid weirdness with '~'. */ + if (asprintf(&arg, "--suffix-dels=%s", backup_suffix_dels) < 0) + goto oom; + args[ac++] = arg; + } if (am_sender) { - if (delete_excluded) - args[ac++] = "--delete-excluded"; + if (max_delete > 0) { + if (asprintf(&arg, "--max-delete=%d", max_delete) < 0)