X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/a5e6228afbf1809d33d9a31e0895c5e955c39ce1..fc5573623194fab2a331d1ffc8d284c9e25e06e7:/backup-dir-dels.diff diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff index 7198018..96a2f41 100644 --- a/backup-dir-dels.diff +++ b/backup-dir-dels.diff @@ -20,6 +20,7 @@ To use this patch, run these commands for a successful build: make diff --git a/backup.c b/backup.c +index 0da6b33..ff77078 100644 --- a/backup.c +++ b/backup.c @@ -29,10 +29,17 @@ extern int preserve_specials; @@ -36,11 +37,11 @@ diff --git a/backup.c b/backup.c extern char *backup_dir; +extern char *backup_dir_dels; + -+static int deleting; ++static BOOL deleting; /* make a complete pathname for backup file */ char *get_backup_name(const char *fname) -@@ -51,11 +58,28 @@ char *get_backup_name(const char *fname) +@@ -51,6 +58,22 @@ char *get_backup_name(const char *fname) return NULL; } @@ -60,17 +61,10 @@ diff --git a/backup.c b/backup.c + return NULL; +} + - /* simple backup creates a backup with a suffix in the same directory */ - static int make_simple_backup(const char *fname) - { - int rename_errno; -- const char *fnamebak = get_backup_name(fname); -+ const char *fnamebak = deleting ? get_delete_name(fname) -+ : get_backup_name(fname); - - if (!fnamebak) - return 0; -@@ -96,7 +120,7 @@ int make_bak_dir(const char *fullpath) + /**************************************************************************** + Create a directory given an absolute path, perms based upon another directory + path +@@ -59,7 +82,7 @@ int make_bak_dir(const char *fullpath) { char fbuf[MAXPATHLEN], *rel, *end, *p; struct file_struct *file; @@ -79,50 +73,49 @@ diff --git a/backup.c b/backup.c stat_x sx; 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 */ +@@ -179,7 +202,7 @@ int make_backup(const char *fname, BOOL prefer_rename) + stat_x sx; + struct file_struct *file; + int save_preserve_xattrs; +- char *buf = get_backup_name(fname); ++ char *buf = deleting ? get_delete_name(fname) : get_backup_name(fname); + int ret = 0; -- if (!(buf = get_backup_name(fname))) { -+ buf = deleting ? get_delete_name(fname) : get_backup_name(fname); -+ if (!buf) { - unmake_file(file); - return 0; + if (!buf) +@@ -341,3 +364,13 @@ int make_backup(const char *fname, BOOL prefer_rename) } -@@ -326,3 +351,13 @@ int make_backup(const char *fname) - return keep_backup(fname); - return make_simple_backup(fname); + return ret; } + +/* backup switch routine called only when backing-up removed file */ -+int safe_delete(char *fname) ++int safe_delete(const char *fname) +{ + int ret; + deleting = 1; -+ ret = make_backup(fname); ++ ret = make_backup(fname, True); + deleting = 0; + return ret; +} -diff --git a/generator.c b/generator.c ---- a/generator.c -+++ b/generator.c -@@ -95,6 +95,9 @@ extern uid_t our_uid; +diff --git a/delete.c b/delete.c +index 33fdd0e..31228d0 100644 +--- a/delete.c ++++ b/delete.c +@@ -28,6 +28,9 @@ extern int max_delete; 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 *cur_flist, *first_flist, *dir_flist; - extern struct filter_list_struct server_filter_list; + extern uid_t our_uid; + extern struct stats stats; -@@ -136,10 +139,15 @@ enum delret { - /* Forward declaration for delete_item(). */ - static enum delret delete_dir_contents(char *fname, int flags); +@@ -35,10 +38,14 @@ int ignore_perishable = 0; + int non_perishable_cnt = 0; + int skipped_deletes = 0; -+ +/* Function now compares both backup_suffix and backup_suffix_dels. */ - static int is_backup_file(char *fn) + static inline int is_backup_file(char *fn) { int k = strlen(fn) - backup_suffix_len; - return k > 0 && strcmp(fn+k, backup_suffix) == 0; @@ -132,27 +125,28 @@ diff --git a/generator.c b/generator.c + return k > 0 && strcmp(fn+k, backup_suffix_dels) == 0; } - /* Delete a file or directory. If DEL_RECURSE is set in the flags, this will -@@ -178,9 +186,9 @@ static enum delret delete_item(char *fbuf, int mode, int flags) - if (S_ISDIR(mode)) { + /* The directory is about to be deleted: if DEL_RECURSE is given, delete all +@@ -170,9 +177,9 @@ enum delret delete_item(char *fbuf, uint16 mode, uint16 flags) 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; +- if (make_backups > 0 && (backup_dir || !is_backup_file(fbuf))) { ++ if (make_backups > 0 && (backup_dir_dels || !is_backup_file(fbuf))) { + what = "make_backup"; +- ok = make_backup(fbuf, True); ++ ok = safe_delete(fbuf); + if (ok == 2) { + what = "unlink"; + ok = robust_unlink(fbuf) == 0; diff --git a/options.c b/options.c +index e7c6c61..37e4086 100644 --- a/options.c +++ b/options.c -@@ -149,10 +149,14 @@ int no_detach +@@ -151,10 +151,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; @@ -163,7 +157,7 @@ diff --git a/options.c b/options.c char *tmpdir = NULL; char *partial_dir = NULL; char *basis_dir[MAX_BASIS_DIRS+1]; -@@ -164,7 +168,9 @@ char *stdout_format = NULL; +@@ -166,7 +170,9 @@ char *stdout_format = NULL; char *password_file = NULL; char *rsync_path = RSYNC_PATH; char *backup_dir = NULL; @@ -171,18 +165,18 @@ diff --git a/options.c b/options.c char backup_dir_buf[MAXPATHLEN]; +char backup_dir_dels_buf[MAXPATHLEN]; char *sockopts = NULL; - int rsync_port = 0; - int compare_dest = 0; -@@ -320,6 +326,8 @@ void usage(enum logcode F) + char *usermap = NULL; + char *groupmap = NULL; +@@ -669,6 +675,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"); -@@ -591,7 +599,9 @@ static struct poptOption long_options[] = { +@@ -968,7 +976,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 }, @@ -192,17 +186,17 @@ diff --git a/options.c b/options.c {"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 }, -@@ -1405,6 +1415,8 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain) - tmpdir = sanitize_path(NULL, tmpdir, NULL, 0); +@@ -1964,6 +1974,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); + 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); ++ 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; -@@ -1426,6 +1438,14 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain) - if (check_filter(elp, dir, 1) < 0) + if (daemon_filter_list.head && !am_sender) { + struct filter_list_struct *elp = &daemon_filter_list; +@@ -1985,6 +1997,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 */ @@ -210,29 +204,34 @@ diff --git a/options.c b/options.c + 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) -@@ -1437,6 +1457,15 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain) +@@ -1996,6 +2016,20 @@ int parse_arguments(int *argc_p, const char ***argv_p) backup_suffix); return 0; } ++ /* --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 && !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; -@@ -1460,6 +1489,30 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain) +@@ -2019,6 +2053,34 @@ int parse_arguments(int *argc_p, const char ***argv_p) "P *%s", backup_suffix); parse_rule(&filter_list, backup_dir_buf, 0, 0); } @@ -248,7 +247,7 @@ diff --git a/options.c b/options.c + backup_dir_dels_buf[backup_dir_dels_len++] = '/'; + backup_dir_dels_buf[backup_dir_dels_len] = '\0'; + } -+ if (verbose > 1 && !am_sender) ++ if (INFO_GTE(BACKUP, 1) && !am_sender) + rprintf(FINFO, "backup_dir_dels is %s\n", backup_dir_dels_buf); + } else if (backup_dir) { + backup_dir_dels = backup_dir; @@ -259,11 +258,15 @@ diff --git a/options.c b/options.c + 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 = 0; /* Implied, so avoid -O to sender. */ -@@ -1853,6 +1906,10 @@ void server_options(char **args, int *argc_p) +@@ -2432,6 +2494,10 @@ void server_options(char **args, int *argc_p) args[ac++] = "--backup-dir"; args[ac++] = backup_dir; } @@ -274,7 +277,7 @@ diff --git a/options.c b/options.c /* Only send --suffix if it specifies a non-default value. */ if (strcmp(backup_suffix, backup_dir ? "" : BACKUP_SUFFIX) != 0) { -@@ -1861,7 +1918,14 @@ void server_options(char **args, int *argc_p) +@@ -2440,7 +2506,14 @@ void server_options(char **args, int *argc_p) goto oom; args[ac++] = arg; }