X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/70891d2683929346847f5a7eccc135ee0352c4ec..5ba66156c2f3b31eae4a1ae88a44c1efaf248c9c:/backup-dir-dels.diff diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff index 14842a2..3f9fb0a 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 -@@ -30,10 +30,17 @@ extern int safe_symlinks; - extern int flist_extra_ndx; - extern int file_struct_len; +@@ -28,10 +28,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; @@ -39,7 +39,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) -@@ -52,11 +59,28 @@ char *get_backup_name(const char *fname) +@@ -50,11 +57,28 @@ char *get_backup_name(const char *fname) return NULL; } @@ -69,17 +69,17 @@ To use this patch, run these commands for a successful build: if (!fnamebak) return 0; -@@ -96,7 +120,8 @@ path - static int make_bak_dir(char *fullpath) +@@ -95,7 +119,8 @@ static int make_bak_dir(char *fullpath) { - STRUCT_STAT st; + statx sx; + 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; -@@ -186,7 +211,8 @@ static int keep_backup(const char *fname +@@ -198,7 +223,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; } -@@ -285,3 +311,13 @@ int make_backup(const char *fname) +@@ -306,3 +332,13 @@ int make_backup(const char *fname) return keep_backup(fname); return make_simple_backup(fname); } @@ -105,17 +105,17 @@ To use this patch, run these commands for a successful build: +} --- old/generator.c +++ new/generator.c -@@ -92,6 +92,9 @@ extern dev_t filesystem_dev; +@@ -94,6 +94,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; -@@ -117,10 +120,14 @@ enum delret { +@@ -127,10 +130,14 @@ enum delret { static enum delret delete_dir_contents(char *fname, int flags); @@ -131,12 +131,12 @@ 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 -@@ -156,9 +163,9 @@ static enum delret delete_item(char *fbu +@@ -166,9 +173,9 @@ static enum delret delete_item(char *fbu if (S_ISDIR(mode)) { what = "rmdir"; 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))) { +- } 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); @@ -145,7 +145,7 @@ To use this patch, run these commands for a successful build: ok = robust_unlink(fbuf) == 0; --- old/options.c +++ new/options.c -@@ -138,10 +138,14 @@ int no_detach +@@ -137,10 +137,14 @@ int no_detach int write_batch = 0; int read_batch = 0; int backup_dir_len = 0; @@ -160,7 +160,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; +@@ -152,7 +156,9 @@ char *stdout_format = NULL; char *password_file = NULL; char *rsync_path = RSYNC_PATH; char *backup_dir = NULL; @@ -170,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; -@@ -288,6 +294,8 @@ void usage(enum logcode F) +@@ -293,6 +299,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,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"); -@@ -516,7 +524,9 @@ static struct poptOption long_options[] +@@ -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 }, {"backup-dir", 0, POPT_ARG_STRING, &backup_dir, 0, 0, 0 }, @@ -189,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 }, -@@ -1235,6 +1245,8 @@ int parse_arguments(int *argc, const cha +@@ -1271,6 +1281,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); @@ -198,7 +198,7 @@ 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; -@@ -1252,6 +1264,14 @@ int parse_arguments(int *argc, const cha +@@ -1288,6 +1300,14 @@ int parse_arguments(int *argc, const cha if (check_filter(elp, backup_dir, 1) < 0) goto options_rejected; } @@ -213,7 +213,7 @@ To use this patch, run these commands for a successful build: } if (!backup_suffix) -@@ -1263,6 +1283,16 @@ int parse_arguments(int *argc, const cha +@@ -1299,6 +1319,16 @@ int parse_arguments(int *argc, const cha backup_suffix); return 0; } @@ -230,9 +230,9 @@ 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; -@@ -1286,6 +1316,31 @@ int parse_arguments(int *argc, const cha +@@ -1322,6 +1352,31 @@ int parse_arguments(int *argc, const cha "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) { @@ -262,7 +262,7 @@ To use this patch, run these commands for a successful build: if (make_backups && !backup_dir) omit_dir_times = 1; -@@ -1650,6 +1705,10 @@ void server_options(char **args,int *arg +@@ -1689,6 +1744,10 @@ void server_options(char **args,int *arg args[ac++] = "--backup-dir"; args[ac++] = backup_dir; } @@ -273,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) { -@@ -1658,7 +1717,13 @@ void server_options(char **args,int *arg +@@ -1697,7 +1756,13 @@ void server_options(char **args,int *arg goto oom; args[ac++] = arg; } @@ -286,5 +286,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 (delete_before) + args[ac++] = "--delete-before";