X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/98e4de3da8554e90a2d409ce5b8f0a548d38912f..4d7a8142eb7e608ba263e86313e9081e83a48c28:/backup-dir-dels.diff diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff index f2aabdb..35d6327 100644 --- a/backup-dir-dels.diff +++ b/backup-dir-dels.diff @@ -13,6 +13,12 @@ suffix. Marc St-Onge +To use this patch, run these commands for a successful build: + + patch -p1 0 && strcmp(fn+k, backup_suffix_dels) == 0; } - -@@ -124,8 +131,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) { -@@ -147,9 +154,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)) + /* Delete a file or directory. If DEL_RECURSE is set in the flags, this will +@@ -153,9 +160,9 @@ static enum delret delete_item(char *fna + if (S_ISDIR(mode)) { + what = "rmdir"; + ok = do_rmdir(fname) == 0; +- } else if (make_backups && (backup_dir || !is_backup_file(fname))) { ++ } else if (make_backups && (backup_dir_dels || !is_backup_file(fname))) { + what = "make_backup"; - ok = make_backup(fname); + ok = safe_delete(fname); - else - ok = do_rmdir(fname) == 0; - if (ok) { + } else { + what = "unlink"; + ok = robust_unlink(fname) == 0; --- old/options.c +++ new/options.c @@ -138,10 +138,14 @@ int no_detach @@ -172,7 +167,7 @@ Marc St-Onge 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; @@ -182,7 +177,7 @@ Marc St-Onge 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); @@ -191,7 +186,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," --append append data onto shorter files\n"); -@@ -499,7 +507,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 }, @@ -201,20 +196,18 @@ 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 }, -@@ -1219,6 +1229,10 @@ int parse_arguments(int *argc, const cha +@@ -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, NULL); - die_on_unsafe_path(backup_dir, 0); - } -+ if (backup_dir_dels) { ++ if (backup_dir_dels) + backup_dir_dels = sanitize_path(NULL, backup_dir_dels, NULL, 0, NULL); -+ die_on_unsafe_path(backup_dir_dels, 0); -+ } } if (server_filter_list.head && !am_sender) { struct filter_list_struct *elp = &server_filter_list; -@@ -1240,6 +1254,14 @@ int parse_arguments(int *argc, const cha - return 0; - } +@@ -1249,6 +1261,14 @@ int parse_arguments(int *argc, const cha + if (check_filter(elp, backup_dir, 1) < 0) + goto options_rejected; } + /* Clean backup_dir_dels same as for backup_dir */ + if (backup_dir_dels) { @@ -227,7 +220,7 @@ Marc St-Onge } if (!backup_suffix) -@@ -1251,6 +1273,16 @@ int parse_arguments(int *argc, const cha +@@ -1260,6 +1280,16 @@ int parse_arguments(int *argc, const cha backup_suffix); return 0; } @@ -244,7 +237,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; -@@ -1274,6 +1306,31 @@ int parse_arguments(int *argc, const cha +@@ -1283,6 +1313,31 @@ int parse_arguments(int *argc, const cha "P *%s", backup_suffix); parse_rule(&filter_list, backup_dir_buf, 0, 0); } @@ -276,7 +269,7 @@ Marc St-Onge if (make_backups && !backup_dir) omit_dir_times = 1; -@@ -1618,6 +1675,10 @@ void server_options(char **args,int *arg +@@ -1647,6 +1702,10 @@ void server_options(char **args,int *arg args[ac++] = "--backup-dir"; args[ac++] = backup_dir; } @@ -287,7 +280,7 @@ Marc St-Onge /* Only send --suffix if it specifies a non-default value. */ if (strcmp(backup_suffix, backup_dir ? "" : BACKUP_SUFFIX) != 0) { -@@ -1626,7 +1687,13 @@ void server_options(char **args,int *arg +@@ -1655,7 +1714,13 @@ void server_options(char **args,int *arg goto oom; args[ac++] = arg; }