From: Wayne Davison Date: Mon, 24 Jan 2005 02:26:08 +0000 (+0000) Subject: Fixed some failing hunks. X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/commitdiff_plain/fd0e045e10f8ddd0cfbd0e00a4593ef0b24c726a Fixed some failing hunks. --- diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff index 58fc8cf..b6f94a4 100644 --- a/backup-dir-dels.diff +++ b/backup-dir-dels.diff @@ -106,9 +106,60 @@ Marc St-Onge + deleting = 0; + return ret; +} ---- orig/options.c 2005-01-20 23:05:34 +--- orig/flist.c 2005-01-24 01:43:09 ++++ flist.c 2005-01-24 02:21:33 +@@ -48,6 +48,8 @@ extern int xfer_dirs; + extern char curr_dir[MAXPATHLEN]; + extern char *backup_dir; + extern char *backup_suffix; ++extern char *delete_dir; ++extern char *delete_suffix; + extern int filesfrom_fd; + + extern int one_file_system; +@@ -62,6 +64,7 @@ extern int relative_paths; + extern int implied_dirs; + extern int make_backups; + extern int backup_suffix_len; ++extern int delete_suffix_len; + extern int copy_links; + extern int copy_unsafe_links; + extern int protocol_version; +@@ -1670,10 +1673,14 @@ char *f_name(struct file_struct *f) + return f_name_to(f, names[n]); + } + ++/* Function now checks if file matches backup or delete suffix patterns */ + static int is_backup_file(char *fn) + { + int k = strlen(fn) - backup_suffix_len; +- return k > 0 && strcmp(fn+k, backup_suffix) == 0; ++ if (k > 0 && strcmp(fn+k, backup_suffix) == 0) ++ return 1; ++ k += backup_suffix_len - delete_suffix_len; ++ return k > 0 && strcmp(fn+k, delete_suffix) == 0; + } + + void delete_in_dir(struct file_list *flist, char *fname) +@@ -1727,11 +1734,12 @@ void delete_in_dir(struct file_list *fli + || (delete_during && S_ISDIR(mode) + && !S_ISDIR(flist->files[j]->mode))) { + char *f = f_name(del_flist->files[i]); +- if (make_backups && (backup_dir || !is_backup_file(f)) ++ int backup_file = is_backup_file(f); ++ if (make_backups && (delete_dir || !backup_file) + && !S_ISDIR(mode)) { +- make_backup(f); ++ safe_delete(f); + if (verbose) { +- rprintf(FINFO, "deleting %s\n", ++ rprintf(FINFO, "safe-deleting %s\n", + safe_fname(f)); + } + } else { +--- orig/options.c 2005-01-24 01:43:10 +++ options.c 2004-11-27 18:37:18 -@@ -116,10 +116,14 @@ int no_detach = 0; +@@ -119,10 +119,14 @@ int no_detach = 0; int write_batch = 0; int read_batch = 0; int backup_dir_len = 0; @@ -123,7 +174,7 @@ Marc St-Onge char *tmpdir = NULL; char *partial_dir = NULL; char *basis_dir[MAX_BASIS_DIRS+1]; -@@ -129,7 +133,9 @@ char *log_format = NULL; +@@ -132,7 +136,9 @@ char *log_format = NULL; char *password_file = NULL; char *rsync_path = RSYNC_PATH; char *backup_dir = NULL; @@ -133,7 +184,7 @@ Marc St-Onge int rsync_port = 0; int compare_dest = 0; int copy_dest = 0; -@@ -247,7 +253,9 @@ void usage(enum logcode F) +@@ -250,7 +256,9 @@ void usage(enum logcode F) rprintf(F," --no-implied-dirs don't send implied dirs with -R\n"); rprintf(F," -b, --backup make backups (see --suffix & --backup-dir)\n"); rprintf(F," --backup-dir make backups into this directory\n"); @@ -142,8 +193,8 @@ Marc St-Onge + rprintf(F," --delete-suffix=SUFFIX deleted files suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX); rprintf(F," -u, --update update only (don't overwrite newer files)\n"); rprintf(F," --inplace update destination files in-place (SEE MAN PAGE)\n"); - rprintf(F," -K, --keep-dirlinks treat symlinked dir on receiver as dir\n"); -@@ -331,6 +339,7 @@ static struct poptOption long_options[] + rprintf(F," -d, --dirs transfer directories without recursing\n"); +@@ -337,6 +345,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 }, @@ -151,7 +202,7 @@ Marc St-Onge {"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 }, -@@ -399,6 +408,7 @@ static struct poptOption long_options[] +@@ -409,6 +418,7 @@ static struct poptOption long_options[] {"log-format", 0, POPT_ARG_STRING, &log_format, 0, 0, 0 }, {"bwlimit", 0, POPT_ARG_INT, &bwlimit, 0, 0, 0 }, {"backup-dir", 0, POPT_ARG_STRING, &backup_dir, 0, 0, 0 }, @@ -159,7 +210,7 @@ Marc St-Onge {"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 }, -@@ -871,6 +881,8 @@ int parse_arguments(int *argc, const cha +@@ -878,6 +888,8 @@ int parse_arguments(int *argc, const cha partial_dir = sanitize_path(NULL, partial_dir, NULL, 0); if (backup_dir) backup_dir = sanitize_path(NULL, backup_dir, NULL, 0); @@ -168,7 +219,7 @@ Marc St-Onge if (files_from) files_from = sanitize_path(NULL, files_from, NULL, 0); } -@@ -897,6 +909,12 @@ int parse_arguments(int *argc, const cha +@@ -904,6 +916,12 @@ int parse_arguments(int *argc, const cha if (check_exclude(elp, backup_dir, 1) < 0) goto options_rejected; } @@ -181,7 +232,7 @@ Marc St-Onge } if (server_exclude_list.head && files_from) { clean_fname(files_from, 1); -@@ -917,6 +935,16 @@ int parse_arguments(int *argc, const cha +@@ -924,6 +942,16 @@ int parse_arguments(int *argc, const cha backup_suffix); return 0; } @@ -198,7 +249,7 @@ 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; -@@ -936,6 +964,31 @@ int parse_arguments(int *argc, const cha +@@ -943,6 +971,31 @@ int parse_arguments(int *argc, const cha "--suffix cannot be a null string without --backup-dir\n"); return 0; } @@ -230,7 +281,7 @@ Marc St-Onge if (do_progress && !verbose) verbose = 1; -@@ -1144,6 +1197,10 @@ void server_options(char **args,int *arg +@@ -1156,6 +1209,10 @@ void server_options(char **args,int *arg args[ac++] = "--backup-dir"; args[ac++] = backup_dir; } @@ -241,7 +292,7 @@ Marc St-Onge /* Only send --suffix if it specifies a non-default value. */ if (strcmp(backup_suffix, backup_dir ? "" : BACKUP_SUFFIX) != 0) { -@@ -1152,7 +1209,13 @@ void server_options(char **args,int *arg +@@ -1164,7 +1221,13 @@ void server_options(char **args,int *arg goto oom; args[ac++] = arg; } @@ -256,50 +307,3 @@ Marc St-Onge if (am_sender) { if (delete_excluded) args[ac++] = "--delete-excluded"; ---- orig/receiver.c 2005-01-21 00:35:26 -+++ receiver.c 2004-11-03 23:10:06 -@@ -44,8 +44,11 @@ extern int basis_dir_cnt; - extern int make_backups; - extern int do_progress; - extern char *backup_dir; -+extern char *delete_dir; - extern char *backup_suffix; -+extern char *delete_suffix; - extern int backup_suffix_len; -+extern int delete_suffix_len; - extern int cleanup_got_literal; - extern int module_id; - extern int ignore_errors; -@@ -56,11 +59,14 @@ extern int inplace; - - extern struct exclude_list_struct server_exclude_list; - -- -+/* Function now checks if file matches backup or delete suffix patterns */ - static int is_backup_file(char *fn) - { - int k = strlen(fn) - backup_suffix_len; -- return k > 0 && strcmp(fn+k, backup_suffix) == 0; -+ if (k > 0 && strcmp(fn+k, backup_suffix) == 0) -+ return 1; -+ k = strlen(fn) - delete_suffix_len; -+ return k > 0 && strcmp(fn+k, delete_suffix) == 0; - } - - -@@ -102,11 +108,12 @@ void delete_files(struct file_list *flis - if (flist_find(flist,local_file_list->files[i]) < 0) { - char *f = f_name(local_file_list->files[i]); - int mode = local_file_list->files[i]->mode; -- if (make_backups && (backup_dir || !is_backup_file(f)) -+ int backup_file = is_backup_file(f); -+ if (make_backups && (delete_dir || !backup_file) - && !S_ISDIR(mode)) { -- make_backup(f); -+ safe_delete(f); - if (verbose) { -- rprintf(FINFO, "deleting %s\n", -+ rprintf(FINFO, "safe-deleting %s\n", - safe_fname(f)); - } - } else {