X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/19a778eb4cb069758ca47618b2e4c1b8dce52d2c..40ec1b8b8ce942a4505b3a4a67516b8d5947f786:/backup-dir-dels.diff diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff index 36c18c6..a614e66 100644 --- a/backup-dir-dels.diff +++ b/backup-dir-dels.diff @@ -13,13 +13,11 @@ suffix. Marc St-Onge ---- orig/backup.c 2005-02-22 02:10:16 -+++ backup.c 2005-02-22 02:11:15 -@@ -22,11 +22,17 @@ +--- old/backup.c ++++ new/backup.c +@@ -23,10 +23,15 @@ extern int verbose; - extern int backup_suffix_len; -+extern int backup_suffix_dels_len; extern int backup_dir_len; +extern int backup_dir_dels_len; extern unsigned int backup_dir_remainder; @@ -33,8 +31,8 @@ Marc St-Onge extern int am_root; extern int preserve_devices; -@@ -35,6 +41,8 @@ extern int preserve_hard_links; - extern int orig_umask; +@@ -34,6 +39,8 @@ extern int preserve_specials; + extern int preserve_links; extern int safe_symlinks; +static int deleting; @@ -42,7 +40,7 @@ Marc St-Onge /* make a complete pathname for backup file */ char *get_backup_name(char *fname) { -@@ -52,11 +60,28 @@ char *get_backup_name(char *fname) +@@ -51,11 +58,28 @@ char *get_backup_name(char *fname) return NULL; } @@ -72,7 +70,7 @@ Marc St-Onge if (!fnamebak) return 0; -@@ -97,7 +122,8 @@ path +@@ -95,7 +119,8 @@ path static int make_bak_dir(char *fullpath) { STRUCT_STAT st; @@ -82,8 +80,8 @@ Marc St-Onge char *end = rel + strlen(rel); char *p = end; -@@ -184,7 +210,8 @@ static int keep_backup(char *fname) - if (!(file = make_file(fname, NULL, NO_FILTERS))) +@@ -183,7 +208,8 @@ static int keep_backup(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))) @@ -92,7 +90,7 @@ Marc St-Onge return 0; /* Check to see if this is a device file, or link */ -@@ -277,3 +304,13 @@ int make_backup(char *fname) +@@ -278,3 +304,13 @@ int make_backup(char *fname) return keep_backup(fname); return make_simple_backup(fname); } @@ -106,23 +104,23 @@ Marc St-Onge + deleting = 0; + return ret; +} ---- orig/flist.c 2005-02-23 02:57:26 -+++ flist.c 2005-02-22 02:12:20 -@@ -67,6 +67,9 @@ extern char *log_format; +--- old/generator.c ++++ new/generator.c +@@ -90,6 +90,9 @@ extern dev_t filesystem_dev; 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 filter_list_struct server_filter_list; - extern char curr_dir[MAXPATHLEN]; - -@@ -1775,10 +1778,14 @@ struct file_list *get_dirlist(const char +@@ -100,10 +103,14 @@ static int deletion_count = 0; /* used t + #define DEL_TERSE (1<<3) - static int deletion_count = 0; /* used to implement --max-delete */ -+/* Function now checks if file matches backup- or delete-suffix patterns. */ ++/* Function now compares both backup_suffix and backup_suffix_dels. */ static int is_backup_file(char *fn) { int k = strlen(fn) - backup_suffix_len; @@ -134,8 +132,19 @@ Marc St-Onge } -@@ -1818,9 +1825,9 @@ int delete_file(char *fname, int mode, i - if (dry_run && zap_dir) { +@@ -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) @@ -146,9 +155,9 @@ Marc St-Onge else ok = do_rmdir(fname) == 0; if (ok) { ---- orig/options.c 2005-02-23 02:57:26 -+++ options.c 2005-02-21 11:02:45 -@@ -126,10 +126,14 @@ int no_detach +--- old/options.c ++++ new/options.c +@@ -138,10 +138,14 @@ int no_detach int write_batch = 0; int read_batch = 0; int backup_dir_len = 0; @@ -163,17 +172,17 @@ Marc St-Onge char *tmpdir = NULL; char *partial_dir = NULL; char *basis_dir[MAX_BASIS_DIRS+1]; -@@ -139,7 +143,9 @@ char *log_format = NULL; +@@ -153,7 +157,9 @@ char *stdout_format = NULL; char *password_file = NULL; char *rsync_path = RSYNC_PATH; char *backup_dir = NULL; +char *backup_dir_dels = NULL; char backup_dir_buf[MAXPATHLEN]; +char backup_dir_dels_buf[MAXPATHLEN]; + char *sockopts = NULL; int rsync_port = 0; int compare_dest = 0; - int link_dest = 0; -@@ -269,6 +275,8 @@ void usage(enum logcode F) +@@ -290,6 +296,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); @@ -181,46 +190,42 @@ Marc St-Onge + rprintf(F," --suffix-dels=SUFFIX set removed-files suffix (defaults to --suffix)\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," -d, --dirs transfer directories without recursing\n"); -@@ -363,6 +371,7 @@ static struct poptOption long_options[] - /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */ - {"version", 0, POPT_ARG_NONE, 0, OPT_VERSION, 0, 0}, - {"suffix", 0, POPT_ARG_STRING, &backup_suffix, 0, 0, 0 }, -+ {"suffix-dels", 0, POPT_ARG_STRING, &backup_suffix_dels, 0, 0, 0 }, - {"rsync-path", 0, POPT_ARG_STRING, &rsync_path, 0, 0, 0 }, - {"password-file", 0, POPT_ARG_STRING, &password_file, 0, 0, 0 }, - {"ignore-times", 'I', POPT_ARG_NONE, &ignore_times, 0, 0, 0 }, -@@ -442,6 +451,7 @@ static struct poptOption long_options[] - {"itemize-changes", 'i', POPT_ARG_NONE, &itemize_changes, 0, 0, 0 }, + rprintf(F," --append append data onto shorter files\n"); +@@ -514,7 +522,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 }, + {"backup-dir-dels", 0, POPT_ARG_STRING, &backup_dir_dels, 0, 0, 0 }, - {"hard-links", 'H', POPT_ARG_NONE, &preserve_hard_links, 0, 0, 0 }, + {"suffix", 0, POPT_ARG_STRING, &backup_suffix, 0, 0, 0 }, ++ {"suffix-dels", 0, POPT_ARG_STRING, &backup_suffix_dels, 0, 0, 0 }, + {"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 }, -@@ -1005,6 +1015,8 @@ int parse_arguments(int *argc, const cha - partial_dir = sanitize_path(NULL, partial_dir, NULL, 0); +@@ -1225,6 +1235,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); -+ if (backup_dir_dels) -+ backup_dir_dels = sanitize_path(NULL, backup_dir_dels, NULL, 0); - if (files_from) - files_from = sanitize_path(NULL, files_from, NULL, 0); + backup_dir = sanitize_path(NULL, backup_dir, NULL, 0, NULL); ++ if (backup_dir_dels) ++ backup_dir_dels = sanitize_path(NULL, backup_dir_dels, NULL, 0, NULL); } -@@ -1037,6 +1049,12 @@ int parse_arguments(int *argc, const cha - if (check_filter(elp, backup_dir, 1) < 0) - goto options_rejected; + if (server_filter_list.head && !am_sender) { + struct filter_list_struct *elp = &server_filter_list; +@@ -1246,6 +1258,14 @@ int parse_arguments(int *argc, const cha + return 0; + } } + /* Clean backup_dir_dels same as for backup_dir */ + if (backup_dir_dels) { ++ if (!*backup_dir_dels) ++ goto options_rejected; + clean_fname(backup_dir_dels, 1); + if (check_filter(elp, backup_dir_dels, 1) < 0) + goto options_rejected; + } } - if (server_filter_list.head && files_from) { - if (!*files_from) -@@ -1059,6 +1077,16 @@ int parse_arguments(int *argc, const cha + + if (!backup_suffix) +@@ -1257,6 +1277,16 @@ int parse_arguments(int *argc, const cha backup_suffix); return 0; } @@ -237,9 +242,9 @@ Marc St-Onge 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; -@@ -1080,6 +1108,31 @@ int parse_arguments(int *argc, const cha - "--suffix cannot be a null string without --backup-dir\n"); - return 0; +@@ -1280,6 +1310,31 @@ int parse_arguments(int *argc, const cha + "P *%s", backup_suffix); + 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) { @@ -269,18 +274,18 @@ Marc St-Onge if (make_backups && !backup_dir) omit_dir_times = 1; -@@ -1345,6 +1398,10 @@ void server_options(char **args,int *arg +@@ -1639,6 +1694,10 @@ void server_options(char **args,int *arg args[ac++] = "--backup-dir"; args[ac++] = backup_dir; } -+ if (backup_dir_dels) { ++ if (backup_dir_dels && backup_dir_dels != backup_dir) { + args[ac++] = "--backup-dir-dels"; + args[ac++] = backup_dir_dels; + } /* Only send --suffix if it specifies a non-default value. */ if (strcmp(backup_suffix, backup_dir ? "" : BACKUP_SUFFIX) != 0) { -@@ -1353,7 +1410,13 @@ void server_options(char **args,int *arg +@@ -1647,7 +1706,13 @@ void server_options(char **args,int *arg goto oom; args[ac++] = arg; }