From daceaa67aaf5c0c7d4dcecba3675170480c7a751 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Sat, 27 Nov 2004 18:39:28 +0000 Subject: [PATCH] Fixed failing hunks. --- backup-dir-dels.diff | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff index 8b3660e..362630e 100644 --- a/backup-dir-dels.diff +++ b/backup-dir-dels.diff @@ -106,9 +106,9 @@ Marc St-Onge + deleting = 0; + return ret; +} ---- orig/options.c 2004-10-14 17:11:40 -+++ options.c 2004-09-22 02:25:03 -@@ -113,10 +113,14 @@ int no_detach = 0; +--- orig/options.c 2004-11-27 18:27:35 ++++ options.c 2004-11-27 18:37:18 +@@ -115,10 +115,14 @@ int no_detach = 0; int write_batch = 0; int read_batch = 0; int backup_dir_len = 0; @@ -122,18 +122,18 @@ Marc St-Onge +char *delete_suffix = NULL; char *tmpdir = NULL; char *partial_dir = NULL; - char *compare_dest = NULL; -@@ -126,7 +130,9 @@ char *log_format = NULL; + char *basis_dir[MAX_BASIS_DIRS+1]; +@@ -128,7 +132,9 @@ char *log_format = NULL; char *password_file = NULL; char *rsync_path = RSYNC_PATH; char *backup_dir = NULL; +char *delete_dir = NULL; char backup_dir_buf[MAXPATHLEN]; +char delete_dir_buf[MAXPATHLEN]; - int rsync_port = RSYNC_PORT; + int rsync_port = 0; + int copy_dest = 0; int link_dest = 0; - -@@ -239,7 +245,9 @@ void usage(enum logcode F) +@@ -246,7 +252,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"); @@ -143,7 +143,7 @@ Marc St-Onge rprintf(F," -u, --update update only (don't overwrite newer files)\n"); rprintf(F," --inplace update destination files inplace (SEE MAN PAGE)\n"); rprintf(F," -K, --keep-dirlinks treat symlinked dir on receiver as dir\n"); -@@ -319,6 +327,7 @@ static struct poptOption long_options[] +@@ -329,6 +337,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 +151,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 }, -@@ -384,6 +393,7 @@ static struct poptOption long_options[] +@@ -396,6 +405,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,8 +159,8 @@ 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 }, -@@ -796,6 +806,8 @@ int parse_arguments(int *argc, const cha - compare_dest = sanitize_path(NULL, compare_dest, NULL, 0); +@@ -866,6 +876,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); + if (delete_dir) @@ -168,7 +168,7 @@ Marc St-Onge if (files_from) files_from = sanitize_path(NULL, files_from, NULL, 0); } -@@ -821,6 +833,12 @@ int parse_arguments(int *argc, const cha +@@ -892,6 +904,12 @@ int parse_arguments(int *argc, const cha if (check_exclude(elp, backup_dir, 1) < 0) goto options_rejected; } @@ -181,7 +181,7 @@ Marc St-Onge } if (server_exclude_list.head && files_from) { clean_fname(files_from, 1); -@@ -841,6 +859,16 @@ int parse_arguments(int *argc, const cha +@@ -912,6 +930,16 @@ int parse_arguments(int *argc, const cha backup_suffix); return 0; } @@ -198,7 +198,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; -@@ -860,6 +888,31 @@ int parse_arguments(int *argc, const cha +@@ -931,6 +959,31 @@ int parse_arguments(int *argc, const cha "--suffix cannot be a null string without --backup-dir\n"); return 0; } @@ -230,7 +230,7 @@ Marc St-Onge if (do_progress && !verbose) verbose = 1; -@@ -1066,6 +1119,10 @@ void server_options(char **args,int *arg +@@ -1144,6 +1197,10 @@ void server_options(char **args,int *arg args[ac++] = "--backup-dir"; args[ac++] = backup_dir; } @@ -241,7 +241,7 @@ Marc St-Onge /* Only send --suffix if it specifies a non-default value. */ if (strcmp(backup_suffix, backup_dir ? "" : BACKUP_SUFFIX) != 0) { -@@ -1074,7 +1131,13 @@ void server_options(char **args,int *arg +@@ -1152,7 +1209,13 @@ void server_options(char **args,int *arg goto oom; args[ac++] = arg; } @@ -256,9 +256,9 @@ Marc St-Onge if (am_sender) { if (delete_excluded) args[ac++] = "--delete-excluded"; ---- orig/receiver.c 2004-11-03 20:30:45 +--- orig/receiver.c 2004-11-27 17:57:31 +++ receiver.c 2004-11-03 23:10:06 -@@ -43,8 +43,11 @@ extern char *compare_dest; +@@ -43,8 +43,11 @@ extern char *basis_dir[]; extern int make_backups; extern int do_progress; extern char *backup_dir; -- 2.34.1