X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/e621c04178420f97bdfed06deda8ac5276dad594..213d432823cbeee334102c839711184c9a98e469:/backup-dir-dels.diff diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff index a8bd9a1..a724472 100644 --- a/backup-dir-dels.diff +++ b/backup-dir-dels.diff @@ -13,13 +13,17 @@ suffix. Marc St-Onge ---- orig/backup.c 2005-02-22 01:57:58 -+++ backup.c 2005-02-22 02:11:15 -@@ -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; } - -@@ -113,8 +120,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) { -@@ -137,9 +144,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) { ---- orig/options.c 2005-03-28 20:56:55 -+++ options.c 2005-03-01 01:25:39 -@@ -127,10 +127,14 @@ int no_detach + /* Delete a file or directory. If DEL_RECURSE is set in the flags, this will +@@ -169,9 +176,9 @@ static enum delret delete_item(char *fbu + 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; +--- old/options.c ++++ new/options.c +@@ -147,10 +147,14 @@ int no_detach int write_batch = 0; int read_batch = 0; int backup_dir_len = 0; @@ -174,17 +159,17 @@ Marc St-Onge char *tmpdir = NULL; char *partial_dir = NULL; char *basis_dir[MAX_BASIS_DIRS+1]; -@@ -140,7 +144,9 @@ char *log_format = NULL; +@@ -162,7 +166,9 @@ char *stdout_format = NULL; char *password_file = NULL; char *rsync_path = RSYNC_PATH; char *backup_dir = NULL; +char *backup_dir_dels = NULL; char backup_dir_buf[MAXPATHLEN]; +char backup_dir_dels_buf[MAXPATHLEN]; + char *sockopts = NULL; int rsync_port = 0; int compare_dest = 0; - int copy_dest = 0; -@@ -271,6 +277,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); @@ -192,35 +177,29 @@ Marc St-Onge + rprintf(F," --suffix-dels=SUFFIX set removed-files suffix (defaults to --suffix)\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," -d, --dirs transfer directories without recursing\n"); -@@ -367,6 +375,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 }, -+ {"suffix-dels", 0, POPT_ARG_STRING, &backup_suffix_dels, 0, 0, 0 }, - {"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 }, -@@ -447,6 +456,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 }, + rprintf(F," --append append data onto shorter files\n"); +@@ -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 }, - {"hard-links", 'H', POPT_ARG_NONE, &preserve_hard_links, 0, 0, 0 }, + {"suffix", 0, POPT_ARG_STRING, &backup_suffix, 0, 0, 0 }, ++ {"suffix-dels", 0, POPT_ARG_STRING, &backup_suffix_dels, 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 }, -@@ -1008,6 +1018,8 @@ int parse_arguments(int *argc, const cha - partial_dir = sanitize_path(NULL, partial_dir, NULL, 0); +@@ -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); -+ 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; -@@ -1042,6 +1054,14 @@ int parse_arguments(int *argc, const cha - return 0; - } +@@ -1417,6 +1429,14 @@ int parse_arguments(int *argc_p, const c + if (check_filter(elp, backup_dir, 1) < 0) + goto options_rejected; } + /* Clean backup_dir_dels same as for backup_dir */ + if (backup_dir_dels) { @@ -233,7 +212,7 @@ Marc St-Onge } if (!backup_suffix) -@@ -1053,6 +1073,16 @@ int parse_arguments(int *argc, const cha +@@ -1428,6 +1448,16 @@ int parse_arguments(int *argc_p, const c backup_suffix); return 0; } @@ -250,9 +229,9 @@ 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; -@@ -1074,6 +1104,31 @@ int parse_arguments(int *argc, const cha - "--suffix cannot be a null string without --backup-dir\n"); - return 0; +@@ -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); } + /* If backup_dir_dels not supplied default to backup_dir if it has been supplied */ + if (backup_dir && !backup_dir_dels) { @@ -279,21 +258,21 @@ Marc St-Onge + "--suffix-dels cannot be a null string without --backup-dir-dels\n"); + return 0; + } - if (make_backups && !backup_dir) - omit_dir_times = 1; -@@ -1352,6 +1407,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; } -+ if (backup_dir_dels) { ++ if (backup_dir_dels && backup_dir_dels != backup_dir) { + args[ac++] = "--backup-dir-dels"; + args[ac++] = backup_dir_dels; + } /* Only send --suffix if it specifies a non-default value. */ if (strcmp(backup_suffix, backup_dir ? "" : BACKUP_SUFFIX) != 0) { -@@ -1360,7 +1419,13 @@ void server_options(char **args,int *arg +@@ -1853,7 +1912,13 @@ void server_options(char **args, int *ar goto oom; args[ac++] = arg; } @@ -306,5 +285,5 @@ Marc St-Onge + 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)