X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/ffc188460d94afdf8da233d822e7312e676b146a..a5e6228afbf1809d33d9a31e0895c5e955c39ce1:/backup-dir-dels.diff diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff index 3f9fb0a..7198018 100644 --- a/backup-dir-dels.diff +++ b/backup-dir-dels.diff @@ -19,9 +19,10 @@ To use this patch, run these commands for a successful build: ./configure (optional if already run) make ---- old/backup.c -+++ new/backup.c -@@ -28,10 +28,17 @@ extern int preserve_specials; +diff --git a/backup.c b/backup.c +--- a/backup.c ++++ b/backup.c +@@ -29,10 +29,17 @@ extern int preserve_specials; extern int preserve_links; extern int safe_symlinks; extern int backup_dir_len; @@ -39,7 +40,7 @@ To use this patch, run these commands for a successful build: /* make a complete pathname for backup file */ char *get_backup_name(const char *fname) -@@ -50,11 +57,28 @@ char *get_backup_name(const char *fname) +@@ -51,11 +58,28 @@ char *get_backup_name(const char *fname) return NULL; } @@ -69,17 +70,16 @@ To use this patch, run these commands for a successful build: if (!fnamebak) return 0; -@@ -95,7 +119,8 @@ static int make_bak_dir(char *fullpath) +@@ -96,7 +120,7 @@ int make_bak_dir(const char *fullpath) { - statx sx; + char fbuf[MAXPATHLEN], *rel, *end, *p; struct file_struct *file; -- 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; +- int len = backup_dir_len; ++ int len = deleting ? backup_dir_dels_len : backup_dir_len; + stat_x sx; -@@ -198,7 +223,8 @@ static int keep_backup(const 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 */ @@ -89,7 +89,7 @@ To use this patch, run these commands for a successful build: unmake_file(file); return 0; } -@@ -306,3 +332,13 @@ int make_backup(const char *fname) +@@ -326,3 +351,13 @@ int make_backup(const char *fname) return keep_backup(fname); return make_simple_backup(fname); } @@ -103,9 +103,10 @@ To use this patch, run these commands for a successful build: + deleting = 0; + return ret; +} ---- old/generator.c -+++ new/generator.c -@@ -94,6 +94,9 @@ extern mode_t orig_umask; +diff --git a/generator.c b/generator.c +--- a/generator.c ++++ b/generator.c +@@ -95,6 +95,9 @@ extern uid_t our_uid; extern char *backup_dir; extern char *backup_suffix; extern int backup_suffix_len; @@ -115,10 +116,11 @@ To use this patch, run these commands for a successful build: extern struct file_list *cur_flist, *first_flist, *dir_flist; extern struct filter_list_struct server_filter_list; -@@ -127,10 +130,14 @@ enum delret { +@@ -136,10 +139,15 @@ enum delret { + /* Forward declaration for delete_item(). */ static enum delret delete_dir_contents(char *fname, int flags); - ++ +/* Function now compares both backup_suffix and backup_suffix_dels. */ static int is_backup_file(char *fn) { @@ -131,7 +133,7 @@ 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 -@@ -166,9 +173,9 @@ static enum delret delete_item(char *fbu +@@ -178,9 +186,9 @@ static enum delret delete_item(char *fbuf, int mode, int flags) if (S_ISDIR(mode)) { what = "rmdir"; ok = do_rmdir(fbuf) == 0; @@ -143,9 +145,10 @@ To use this patch, run these commands for a successful build: } else { what = "unlink"; ok = robust_unlink(fbuf) == 0; ---- old/options.c -+++ new/options.c -@@ -137,10 +137,14 @@ int no_detach +diff --git a/options.c b/options.c +--- a/options.c ++++ b/options.c +@@ -149,10 +149,14 @@ int no_detach int write_batch = 0; int read_batch = 0; int backup_dir_len = 0; @@ -160,7 +163,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]; -@@ -152,7 +156,9 @@ char *stdout_format = NULL; +@@ -164,7 +168,9 @@ char *stdout_format = NULL; char *password_file = NULL; char *rsync_path = RSYNC_PATH; char *backup_dir = NULL; @@ -170,7 +173,7 @@ To use this patch, run these commands for a successful build: char *sockopts = NULL; int rsync_port = 0; int compare_dest = 0; -@@ -293,6 +299,8 @@ void usage(enum logcode F) +@@ -320,6 +326,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); @@ -179,9 +182,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"); -@@ -527,7 +535,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 }, +@@ -591,7 +599,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 }, @@ -189,17 +192,17 @@ 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 }, -@@ -1271,6 +1281,8 @@ int parse_arguments(int *argc, const cha - tmpdir = sanitize_path(NULL, tmpdir, NULL, 0, NULL); +@@ -1405,6 +1415,8 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain) + tmpdir = sanitize_path(NULL, tmpdir, NULL, 0); if (backup_dir) - backup_dir = sanitize_path(NULL, backup_dir, NULL, 0, NULL); + backup_dir = sanitize_path(NULL, backup_dir, NULL, 0); + if (backup_dir_dels) -+ backup_dir_dels = sanitize_path(NULL, backup_dir_dels, NULL, 0, NULL); ++ backup_dir_dels = sanitize_path(NULL, backup_dir_dels, NULL, 0); } if (server_filter_list.head && !am_sender) { struct filter_list_struct *elp = &server_filter_list; -@@ -1288,6 +1300,14 @@ int parse_arguments(int *argc, const cha - if (check_filter(elp, backup_dir, 1) < 0) +@@ -1426,6 +1438,14 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain) + if (check_filter(elp, dir, 1) < 0) goto options_rejected; } + /* Clean backup_dir_dels same as for backup_dir */ @@ -213,13 +216,12 @@ To use this patch, run these commands for a successful build: } if (!backup_suffix) -@@ -1299,6 +1319,16 @@ int parse_arguments(int *argc, const cha +@@ -1437,6 +1457,15 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain) backup_suffix); return 0; } -+ /* if backup_suffix_dels not supplied, default to backup_suffix */ + if (!backup_suffix_dels) -+ backup_suffix_dels = backup_dir_dels ? "" : backup_suffix; ++ 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, @@ -230,17 +232,11 @@ 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; -@@ -1322,6 +1352,31 @@ int parse_arguments(int *argc, const cha +@@ -1460,6 +1489,30 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain) "P *%s", backup_suffix); - parse_rule(&filter_list, backup_dir_buf, 0, 0); + 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) { -+ backup_dir_dels = backup_dir; -+ backup_dir_dels_len = backup_dir_len; -+ backup_dir_dels_remainder = backup_dir_remainder; -+ strlcpy(backup_dir_dels_buf, backup_dir_buf, sizeof backup_dir_buf); -+ } else if (backup_dir_dels) { ++ if (backup_dir_dels) { + backup_dir_dels_len = strlcpy(backup_dir_dels_buf, backup_dir_dels, sizeof backup_dir_dels_buf); + backup_dir_dels_remainder = sizeof backup_dir_dels_buf - backup_dir_dels_len; + if (backup_dir_dels_remainder < 32) { @@ -254,15 +250,20 @@ To use this patch, run these commands for a successful build: + } + if (verbose > 1 && !am_sender) + rprintf(FINFO, "backup_dir_dels is %s\n", backup_dir_dels_buf); ++ } else if (backup_dir) { ++ backup_dir_dels = backup_dir; ++ backup_dir_dels_len = backup_dir_len; ++ backup_dir_dels_remainder = backup_dir_remainder; ++ strlcpy(backup_dir_dels_buf, backup_dir_buf, sizeof backup_dir_buf); + } else if (!backup_suffix_dels_len && (!am_server || !am_sender)) { + snprintf(err_buf, sizeof err_buf, + "--suffix-dels cannot be a null string without --backup-dir-dels\n"); + return 0; + } - if (make_backups && !backup_dir) - omit_dir_times = 1; -@@ -1689,6 +1744,10 @@ void server_options(char **args,int *arg + 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) args[ac++] = "--backup-dir"; args[ac++] = backup_dir; } @@ -273,18 +274,19 @@ 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) { -@@ -1697,7 +1756,13 @@ void server_options(char **args,int *arg +@@ -1861,7 +1918,14 @@ void server_options(char **args, int *argc_p) goto oom; args[ac++] = arg; } - -+ /* Only send --suffix-dels if it specifies a non-default value. */ -+ if (strcmp(backup_suffix_dels, backup_dir_dels ? "" : BACKUP_SUFFIX) != 0) { ++ /* Only send --suffix-dels if it specifies a value different from the ++ * --suffix value, which would normally be used for deletions too. */ ++ if (strcmp(backup_suffix_dels, backup_suffix) != 0) { + /* We use the following syntax to avoid weirdness with '~'. */ + if (asprintf(&arg, "--suffix-dels=%s", backup_suffix_dels) < 0) + goto oom; + args[ac++] = arg; + } if (am_sender) { - if (delete_before) - args[ac++] = "--delete-before"; + if (max_delete > 0) { + if (asprintf(&arg, "--max-delete=%d", max_delete) < 0)