X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/03019e41fc3299020c8acdda06cf57a1e2c57a25..99397a259069fc1ee876b6370e1ffe9cd29913be:/backup-dir-dels.diff diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff index 51b71cf..a724472 100644 --- a/backup-dir-dels.diff +++ b/backup-dir-dels.diff @@ -21,9 +21,9 @@ To use this patch, run these commands for a successful build: --- old/backup.c +++ new/backup.c -@@ -23,10 +23,15 @@ - - extern int verbose; +@@ -29,10 +29,17 @@ extern int preserve_specials; + extern int preserve_links; + extern int safe_symlinks; extern int backup_dir_len; +extern int backup_dir_dels_len; extern unsigned int backup_dir_remainder; @@ -34,23 +34,16 @@ To use this patch, run these commands for a successful build: +extern char *backup_suffix_dels; extern char *backup_dir; +extern char *backup_dir_dels; - - extern int am_root; - extern int preserve_devices; -@@ -34,6 +39,8 @@ extern int preserve_specials; - extern int preserve_links; - extern int safe_symlinks; - -+static int deleting; + ++static int deleting; + /* make a complete pathname for backup file */ - char *get_backup_name(char *fname) - { -@@ -51,11 +58,28 @@ char *get_backup_name(char *fname) + char *get_backup_name(const char *fname) +@@ -51,11 +58,28 @@ char *get_backup_name(const char *fname) return NULL; } -+static char *get_delete_name(char *fname) ++static char *get_delete_name(const char *fname) +{ + if (backup_dir_dels) { + if (stringjoin(backup_dir_dels_buf + backup_dir_dels_len, backup_dir_dels_remainder, @@ -67,36 +60,35 @@ To use this patch, run these commands for a successful build: +} + /* simple backup creates a backup with a suffix in the same directory */ - static int make_simple_backup(char *fname) + static int make_simple_backup(const char *fname) { int rename_errno; -- char *fnamebak = get_backup_name(fname); -+ char *fnamebak = deleting ? get_delete_name(fname) -+ : get_backup_name(fname); +- const char *fnamebak = get_backup_name(fname); ++ const char *fnamebak = deleting ? get_delete_name(fname) ++ : get_backup_name(fname); if (!fnamebak) return 0; -@@ -95,7 +119,8 @@ path - static int make_bak_dir(char *fullpath) +@@ -96,7 +120,7 @@ int make_bak_dir(const char *fullpath) { - STRUCT_STAT st; -- 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; + char fbuf[MAXPATHLEN], *rel, *end, *p; + struct file_struct *file; +- int len = backup_dir_len; ++ int len = deleting ? backup_dir_dels_len : backup_dir_len; + stat_x sx; -@@ -183,7 +208,8 @@ static int keep_backup(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 */ -- if (!(buf = get_backup_name(fname))) +- if (!(buf = get_backup_name(fname))) { + buf = deleting ? get_delete_name(fname) : get_backup_name(fname); -+ if (!buf) ++ if (!buf) { + unmake_file(file); return 0; - - /* Check to see if this is a device file, or link */ -@@ -278,3 +304,13 @@ int make_backup(char *fname) + } +@@ -326,3 +351,13 @@ int make_backup(const char *fname) return keep_backup(fname); return make_simple_backup(fname); } @@ -112,18 +104,18 @@ To use this patch, run these commands for a successful build: +} --- old/generator.c +++ new/generator.c -@@ -90,6 +90,9 @@ extern dev_t filesystem_dev; +@@ -93,6 +93,9 @@ extern mode_t orig_umask; extern char *backup_dir; extern char *backup_suffix; extern int backup_suffix_len; +extern char *backup_dir_dels; +extern char *backup_suffix_dels; +extern int backup_suffix_dels_len; - extern struct file_list *the_file_list; + extern struct file_list *cur_flist, *first_flist, *dir_flist; extern struct filter_list_struct server_filter_list; - -@@ -100,10 +103,14 @@ static int deletion_count = 0; /* used t - #define DEL_TERSE (1<<3) + #ifdef ICONV_OPTION +@@ -130,10 +133,14 @@ enum delret { + static enum delret delete_dir_contents(char *fname, int flags); +/* Function now compares both backup_suffix and backup_suffix_dels. */ @@ -137,33 +129,22 @@ To use this patch, run these commands for a successful build: + return k > 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)) -- ok = make_backup(fname); -+ ok = safe_delete(fname); - else - ok = do_rmdir(fname) == 0; - if (ok) { + /* 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 -@@ -138,10 +138,14 @@ int no_detach +@@ -147,10 +147,14 @@ int no_detach int write_batch = 0; int read_batch = 0; int backup_dir_len = 0; @@ -178,7 +159,7 @@ To use this patch, run these commands for a successful build: char *tmpdir = NULL; char *partial_dir = NULL; char *basis_dir[MAX_BASIS_DIRS+1]; -@@ -153,7 +157,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; @@ -188,7 +169,7 @@ To use this patch, run these commands for a successful build: char *sockopts = NULL; int rsync_port = 0; int compare_dest = 0; -@@ -292,6 +298,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); @@ -197,9 +178,9 @@ To use this patch, run these commands for a successful build: 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"); -@@ -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 }, +@@ -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 }, @@ -207,7 +188,7 @@ To use this patch, run these commands for a successful build: {"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 }, -@@ -1232,6 +1242,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); @@ -216,9 +197,9 @@ To use this patch, run these commands for a successful build: } if (server_filter_list.head && !am_sender) { struct filter_list_struct *elp = &server_filter_list; -@@ -1253,6 +1265,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) { @@ -231,7 +212,7 @@ To use this patch, run these commands for a successful build: } if (!backup_suffix) -@@ -1264,6 +1284,16 @@ int parse_arguments(int *argc, const cha +@@ -1428,6 +1448,16 @@ int parse_arguments(int *argc_p, const c backup_suffix); return 0; } @@ -248,7 +229,7 @@ To use this patch, run these commands for a successful build: 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; -@@ -1287,6 +1317,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); } @@ -277,10 +258,10 @@ To use this patch, run these commands for a successful build: + "--suffix-dels cannot be a null string without --backup-dir-dels\n"); + return 0; + } - if (make_backups && !backup_dir) - omit_dir_times = 1; -@@ -1646,6 +1701,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; } @@ -291,7 +272,7 @@ To use this patch, run these commands for a successful build: /* Only send --suffix if it specifies a non-default value. */ if (strcmp(backup_suffix, backup_dir ? "" : BACKUP_SUFFIX) != 0) { -@@ -1654,7 +1713,13 @@ void server_options(char **args,int *arg +@@ -1853,7 +1912,13 @@ void server_options(char **args, int *ar goto oom; args[ac++] = arg; } @@ -304,5 +285,5 @@ To use this patch, run these commands for a successful build: + 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)