From 19a778eb4cb069758ca47618b2e4c1b8dce52d2c Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Fri, 25 Feb 2005 18:50:46 +0000 Subject: [PATCH] Improved the option names. --- backup-dir-dels.diff | 138 +++++++++++++++++++++---------------------- 1 file changed, 69 insertions(+), 69 deletions(-) diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff index 5c66634..36c18c6 100644 --- a/backup-dir-dels.diff +++ b/backup-dir-dels.diff @@ -1,8 +1,8 @@ This patches creates two new command line options as follows: - --backup-dir-rm - --backup-suffix-rm=SUFFIX + --backup-dir-dels=DIR + --suffix-dels=SUFFIX -The backup-dir-rm and backup-suffix-rm options give the ability to store +The backup-dir-dels and suffix-dels options give the ability to store backup of removed files on the receiver in different directories or with different suffix than the backup of files that have been changed but that are still on the source drive. Both commands can be combined. @@ -19,17 +19,17 @@ Marc St-Onge extern int verbose; extern int backup_suffix_len; -+extern int backup_suffix_rm_len; ++extern int backup_suffix_dels_len; extern int backup_dir_len; -+extern int backup_dir_rm_len; ++extern int backup_dir_dels_len; extern unsigned int backup_dir_remainder; -+extern unsigned int backup_dir_rm_remainder; ++extern unsigned int backup_dir_dels_remainder; extern char backup_dir_buf[MAXPATHLEN]; -+extern char backup_dir_rm_buf[MAXPATHLEN]; ++extern char backup_dir_dels_buf[MAXPATHLEN]; extern char *backup_suffix; -+extern char *backup_suffix_rm; ++extern char *backup_suffix_dels; extern char *backup_dir; -+extern char *backup_dir_rm; ++extern char *backup_dir_dels; extern int am_root; extern int preserve_devices; @@ -48,14 +48,14 @@ Marc St-Onge +static char *get_delete_name(char *fname) +{ -+ if (backup_dir_rm) { -+ if (stringjoin(backup_dir_rm_buf + backup_dir_rm_len, backup_dir_rm_remainder, -+ fname, backup_suffix_rm, NULL) < backup_dir_rm_remainder) -+ return backup_dir_rm_buf; ++ if (backup_dir_dels) { ++ if (stringjoin(backup_dir_dels_buf + backup_dir_dels_len, backup_dir_dels_remainder, ++ fname, backup_suffix_dels, NULL) < backup_dir_dels_remainder) ++ return backup_dir_dels_buf; + } else { -+ if (stringjoin(backup_dir_rm_buf, MAXPATHLEN, -+ fname, backup_suffix_rm, NULL) < MAXPATHLEN) -+ return backup_dir_rm_buf; ++ if (stringjoin(backup_dir_dels_buf, MAXPATHLEN, ++ fname, backup_suffix_dels, NULL) < MAXPATHLEN) ++ return backup_dir_dels_buf; + } + + rprintf(FERROR, "delete filename too long\n"); @@ -77,7 +77,7 @@ Marc St-Onge { STRUCT_STAT st; - char *rel = fullpath + backup_dir_len; -+ int dir_len = deleting ? backup_dir_rm_len : 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; @@ -112,9 +112,9 @@ Marc St-Onge extern char *backup_dir; extern char *backup_suffix; extern int backup_suffix_len; -+extern char *backup_dir_rm; -+extern char *backup_suffix_rm; -+extern int backup_suffix_rm_len; ++extern char *backup_dir_dels; ++extern char *backup_suffix_dels; ++extern int backup_suffix_dels_len; extern char curr_dir[MAXPATHLEN]; @@ -129,8 +129,8 @@ Marc St-Onge - return k > 0 && strcmp(fn+k, backup_suffix) == 0; + if (k > 0 && strcmp(fn+k, backup_suffix) == 0) + return 1; -+ k += backup_suffix_len - backup_suffix_rm_len; -+ return k > 0 && strcmp(fn+k, backup_suffix_rm) == 0; ++ k += backup_suffix_len - backup_suffix_dels_len; ++ return k > 0 && strcmp(fn+k, backup_suffix_dels) == 0; } @@ -139,7 +139,7 @@ Marc St-Onge ok = 0; errno = ENOTEMPTY; - } else if (make_backups && !backup_dir && !is_backup_file(fname) -+ } else if (make_backups && !backup_dir_rm && !is_backup_file(fname) ++ } else if (make_backups && !backup_dir_dels && !is_backup_file(fname) && !(flags & DEL_FORCE_RECURSE)) - ok = make_backup(fname); + ok = safe_delete(fname); @@ -152,14 +152,14 @@ Marc St-Onge int write_batch = 0; int read_batch = 0; int backup_dir_len = 0; -+int backup_dir_rm_len = 0; ++int backup_dir_dels_len = 0; int backup_suffix_len; -+int backup_suffix_rm_len; ++int backup_suffix_dels_len; unsigned int backup_dir_remainder; -+unsigned int backup_dir_rm_remainder; ++unsigned int backup_dir_dels_remainder; char *backup_suffix = NULL; -+char *backup_suffix_rm = NULL; ++char *backup_suffix_dels = NULL; char *tmpdir = NULL; char *partial_dir = NULL; char *basis_dir[MAX_BASIS_DIRS+1]; @@ -167,9 +167,9 @@ Marc St-Onge char *password_file = NULL; char *rsync_path = RSYNC_PATH; char *backup_dir = NULL; -+char *backup_dir_rm = NULL; ++char *backup_dir_dels = NULL; char backup_dir_buf[MAXPATHLEN]; -+char backup_dir_rm_buf[MAXPATHLEN]; ++char backup_dir_dels_buf[MAXPATHLEN]; int rsync_port = 0; int compare_dest = 0; int link_dest = 0; @@ -177,8 +177,8 @@ Marc St-Onge 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-rm make backups of removed files into current dir\n"); -+ rprintf(F," --backup-suffix-rm=SUF set removed-files suffix (defaults to --suffix)\n"); ++ 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," -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"); @@ -186,7 +186,7 @@ Marc St-Onge /* 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 }, -+ {"backup-suffix-rm", 0, POPT_ARG_STRING, &backup_suffix_rm, 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 }, @@ -194,7 +194,7 @@ Marc St-Onge {"itemize-changes", 'i', POPT_ARG_NONE, &itemize_changes, 0, 0, 0 }, {"bwlimit", 0, POPT_ARG_INT, &bwlimit, 0, 0, 0 }, {"backup-dir", 0, POPT_ARG_STRING, &backup_dir, 0, 0, 0 }, -+ {"backup-dir-rm", 0, POPT_ARG_STRING, &backup_dir_rm, 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 }, {"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 }, @@ -202,8 +202,8 @@ Marc St-Onge partial_dir = sanitize_path(NULL, partial_dir, NULL, 0); if (backup_dir) backup_dir = sanitize_path(NULL, backup_dir, NULL, 0); -+ if (backup_dir_rm) -+ backup_dir_rm = sanitize_path(NULL, backup_dir_rm, 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); } @@ -211,10 +211,10 @@ Marc St-Onge if (check_filter(elp, backup_dir, 1) < 0) goto options_rejected; } -+ /* Clean backup_dir_rm same as for backup_dir */ -+ if (backup_dir_rm) { -+ clean_fname(backup_dir_rm, 1); -+ if (check_filter(elp, backup_dir_rm, 1) < 0) ++ /* Clean backup_dir_dels same as for backup_dir */ ++ if (backup_dir_dels) { ++ clean_fname(backup_dir_dels, 1); ++ if (check_filter(elp, backup_dir_dels, 1) < 0) + goto options_rejected; + } } @@ -224,14 +224,14 @@ Marc St-Onge backup_suffix); return 0; } -+ /* if suffix_rm not supplied, default to backup_suffix */ -+ if (!backup_suffix_rm) -+ backup_suffix_rm = backup_dir_rm ? "" : backup_suffix; -+ backup_suffix_rm_len = strlen(backup_suffix_rm); -+ if (strchr(backup_suffix_rm, '/') != NULL) { ++ /* 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_len = strlen(backup_suffix_dels); ++ if (strchr(backup_suffix_dels, '/') != NULL) { + snprintf(err_buf, sizeof err_buf, -+ "--backup-suffix-rm cannot contain slashes: %s\n", -+ backup_suffix_rm); ++ "--suffix-dels cannot contain slashes: %s\n", ++ backup_suffix_dels); + return 0; + } if (backup_dir) { @@ -241,29 +241,29 @@ Marc St-Onge "--suffix cannot be a null string without --backup-dir\n"); return 0; } -+ /* If backup_dir_rm not supplied default to backup_dir if it has been supplied */ -+ if (backup_dir && !backup_dir_rm) { -+ backup_dir_rm = backup_dir; -+ backup_dir_rm_len = backup_dir_len; -+ backup_dir_rm_remainder = backup_dir_remainder; -+ strlcpy(backup_dir_rm_buf, backup_dir_buf, sizeof backup_dir_buf); -+ } else if (backup_dir_rm) { -+ backup_dir_rm_len = strlcpy(backup_dir_rm_buf, backup_dir_rm, sizeof backup_dir_rm_buf); -+ backup_dir_rm_remainder = sizeof backup_dir_rm_buf - backup_dir_rm_len; -+ if (backup_dir_rm_remainder < 32) { ++ /* 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) { ++ 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) { + snprintf(err_buf, sizeof err_buf, -+ "the --backup-dir-rm path is WAY too long.\n"); ++ "the --backup-dir-dels path is WAY too long.\n"); + return 0; + } -+ if (backup_dir_rm_buf[backup_dir_rm_len - 1] != '/') { -+ backup_dir_rm_buf[backup_dir_rm_len++] = '/'; -+ backup_dir_rm_buf[backup_dir_rm_len] = '\0'; ++ if (backup_dir_dels_buf[backup_dir_dels_len - 1] != '/') { ++ backup_dir_dels_buf[backup_dir_dels_len++] = '/'; ++ backup_dir_dels_buf[backup_dir_dels_len] = '\0'; + } + if (verbose > 1 && !am_sender) -+ rprintf(FINFO, "backup_dir_rm is %s\n", backup_dir_rm_buf); -+ } else if (!backup_suffix_rm_len && (!am_server || !am_sender)) { ++ rprintf(FINFO, "backup_dir_dels is %s\n", backup_dir_dels_buf); ++ } else if (!backup_suffix_dels_len && (!am_server || !am_sender)) { + snprintf(err_buf, sizeof err_buf, -+ "--backup-suffix-rm cannot be a null string without --backup-dir-rm\n"); ++ "--suffix-dels cannot be a null string without --backup-dir-dels\n"); + return 0; + } if (make_backups && !backup_dir) @@ -273,9 +273,9 @@ Marc St-Onge args[ac++] = "--backup-dir"; args[ac++] = backup_dir; } -+ if (backup_dir_rm) { -+ args[ac++] = "--backup-dir-rm"; -+ args[ac++] = backup_dir_rm; ++ if (backup_dir_dels) { ++ args[ac++] = "--backup-dir-dels"; ++ args[ac++] = backup_dir_dels; + } /* Only send --suffix if it specifies a non-default value. */ @@ -285,10 +285,10 @@ Marc St-Onge args[ac++] = arg; } - -+ /* Only send --backup-suffix-rm if it specifies a non-default value. */ -+ if (strcmp(backup_suffix_rm, backup_dir_rm ? "" : BACKUP_SUFFIX) != 0) { ++ /* Only send --suffix-dels if it specifies a non-default value. */ ++ if (strcmp(backup_suffix_dels, backup_dir_dels ? "" : BACKUP_SUFFIX) != 0) { + /* We use the following syntax to avoid weirdness with '~'. */ -+ if (asprintf(&arg, "--backup-suffix-rm=%s", backup_suffix_rm) < 0) ++ if (asprintf(&arg, "--suffix-dels=%s", backup_suffix_dels) < 0) + goto oom; + args[ac++] = arg; + } -- 2.34.1