X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/87d0091cb030600b538ec74ef956c022d59c4821..a302c04819c87d365481d9a8b516d3c20df8bf46:/backup-dir-dels.diff diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff index 8ba9754..14842a2 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; +@@ -30,10 +30,17 @@ extern int safe_symlinks; + extern int flist_extra_ndx; + extern int file_struct_len; 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) +@@ -52,11 +59,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,16 +60,16 @@ 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 +@@ -96,7 +120,8 @@ path static int make_bak_dir(char *fullpath) { STRUCT_STAT st; @@ -86,17 +79,17 @@ To use this patch, run these commands for a successful build: char *end = rel + strlen(rel); char *p = end; -@@ -183,7 +208,8 @@ static int keep_backup(char *fname) +@@ -186,7 +211,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) + } +@@ -285,3 +311,13 @@ int make_backup(const char *fname) return keep_backup(fname); return make_simple_backup(fname); } @@ -112,7 +105,7 @@ 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; +@@ -92,6 +92,9 @@ extern dev_t filesystem_dev; extern char *backup_dir; extern char *backup_suffix; extern int backup_suffix_len; @@ -122,7 +115,7 @@ To use this patch, run these commands for a successful build: extern struct file_list *the_file_list; extern struct filter_list_struct server_filter_list; -@@ -110,10 +113,14 @@ enum delret { +@@ -117,10 +120,14 @@ enum delret { static enum delret delete_dir_contents(char *fname, int flags); @@ -138,18 +131,18 @@ To use this patch, run these commands for a successful build: } /* Delete a file or directory. If DEL_RECURSE is set in the flags, this will -@@ -147,9 +154,9 @@ static enum delret delete_item(char *fna +@@ -156,9 +163,9 @@ static enum delret delete_item(char *fbu 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))) { + ok = do_rmdir(fbuf) == 0; +- } else if (make_backups && (backup_dir || !is_backup_file(fbuf))) { ++ } else if (make_backups && (backup_dir_dels || !is_backup_file(fbuf))) { what = "make_backup"; -- ok = make_backup(fname); -+ ok = safe_delete(fname); +- ok = make_backup(fbuf); ++ ok = safe_delete(fbuf); } else { what = "unlink"; - ok = robust_unlink(fname) == 0; + ok = robust_unlink(fbuf) == 0; --- old/options.c +++ new/options.c @@ -138,10 +138,14 @@ int no_detach @@ -177,7 +170,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) +@@ -288,6 +294,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); @@ -186,7 +179,7 @@ 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[] +@@ -516,7 +524,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 }, @@ -196,7 +189,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 +@@ -1235,6 +1245,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); @@ -205,9 +198,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; - } +@@ -1252,6 +1264,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) { @@ -220,7 +213,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 +@@ -1263,6 +1283,16 @@ int parse_arguments(int *argc, const cha backup_suffix); return 0; } @@ -237,7 +230,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 +@@ -1286,6 +1316,31 @@ int parse_arguments(int *argc, const cha "P *%s", backup_suffix); parse_rule(&filter_list, backup_dir_buf, 0, 0); } @@ -269,7 +262,7 @@ To use this patch, run these commands for a successful build: if (make_backups && !backup_dir) omit_dir_times = 1; -@@ -1646,6 +1701,10 @@ void server_options(char **args,int *arg +@@ -1650,6 +1705,10 @@ void server_options(char **args,int *arg args[ac++] = "--backup-dir"; args[ac++] = backup_dir; } @@ -280,7 +273,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 +@@ -1658,7 +1717,13 @@ void server_options(char **args,int *arg goto oom; args[ac++] = arg; }