From 5a56905bde21f02af415289ec5555bacbfea674c Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Wed, 16 Feb 2005 15:44:37 +0000 Subject: [PATCH] Fixed patch fuzz. --- backup-dir-dels.diff | 24 ++++++++++++------------ link-by-hash.diff | 40 ++++++++++++++++++++-------------------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff index c0a59bf..22c551c 100644 --- a/backup-dir-dels.diff +++ b/backup-dir-dels.diff @@ -156,7 +156,7 @@ Marc St-Onge safe_fname(f)); } } else if (S_ISDIR(mode)) ---- orig/options.c 2005-02-15 19:27:05 +--- orig/options.c 2005-02-16 15:35:53 +++ options.c 2005-01-28 19:17:35 @@ -119,10 +119,14 @@ int no_detach = 0; int write_batch = 0; @@ -183,7 +183,7 @@ Marc St-Onge int rsync_port = 0; int compare_dest = 0; int copy_dest = 0; -@@ -260,6 +266,8 @@ void usage(enum logcode F) +@@ -261,6 +267,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); @@ -192,7 +192,7 @@ Marc St-Onge 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"); -@@ -354,6 +362,7 @@ static struct poptOption long_options[] +@@ -355,6 +363,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 }, @@ -200,7 +200,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 }, -@@ -433,6 +442,7 @@ static struct poptOption long_options[] +@@ -434,6 +443,7 @@ static struct poptOption long_options[] {"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 }, @@ -208,7 +208,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 }, -@@ -974,6 +984,8 @@ int parse_arguments(int *argc, const cha +@@ -982,6 +992,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); @@ -217,7 +217,7 @@ Marc St-Onge if (files_from) files_from = sanitize_path(NULL, files_from, NULL, 0); } -@@ -1006,6 +1018,12 @@ int parse_arguments(int *argc, const cha +@@ -1014,6 +1026,12 @@ int parse_arguments(int *argc, const cha if (check_filter(elp, backup_dir, 1) < 0) goto options_rejected; } @@ -230,7 +230,7 @@ Marc St-Onge } if (server_filter_list.head && files_from) { if (!*files_from) -@@ -1028,6 +1046,16 @@ int parse_arguments(int *argc, const cha +@@ -1036,6 +1054,16 @@ int parse_arguments(int *argc, const cha backup_suffix); return 0; } @@ -247,7 +247,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; -@@ -1049,6 +1077,31 @@ int parse_arguments(int *argc, const cha +@@ -1057,6 +1085,31 @@ int parse_arguments(int *argc, const cha "--suffix cannot be a null string without --backup-dir\n"); return 0; } @@ -277,9 +277,9 @@ Marc St-Onge + return 0; + } - if (do_progress && !verbose && !itemize_changes) { - if (refused_verbose) { -@@ -1287,6 +1340,10 @@ void server_options(char **args,int *arg + if (log_format) { + if (strstr(log_format, "%i") != NULL) +@@ -1305,6 +1358,10 @@ void server_options(char **args,int *arg args[ac++] = "--backup-dir"; args[ac++] = backup_dir; } @@ -290,7 +290,7 @@ Marc St-Onge /* Only send --suffix if it specifies a non-default value. */ if (strcmp(backup_suffix, backup_dir ? "" : BACKUP_SUFFIX) != 0) { -@@ -1295,7 +1352,13 @@ void server_options(char **args,int *arg +@@ -1313,7 +1370,13 @@ void server_options(char **args,int *arg goto oom; args[ac++] = arg; } diff --git a/link-by-hash.diff b/link-by-hash.diff index 5760353..ccc0a0e 100644 --- a/link-by-hash.diff +++ b/link-by-hash.diff @@ -365,7 +365,7 @@ the file's name. +} + +#endif ---- orig/options.c 2005-02-14 02:45:10 +--- orig/options.c 2005-02-16 15:35:53 +++ options.c 2005-02-14 02:52:09 @@ -132,6 +132,7 @@ char *log_format = NULL; char *password_file = NULL; @@ -375,7 +375,7 @@ the file's name. char backup_dir_buf[MAXPATHLEN]; int rsync_port = 0; int compare_dest = 0; -@@ -307,6 +308,7 @@ void usage(enum logcode F) +@@ -309,6 +310,7 @@ void usage(enum logcode F) rprintf(F," --compare-dest=DIR also compare destination files relative to DIR\n"); rprintf(F," --copy-dest=DIR ... and include copies of unchanged files\n"); rprintf(F," --link-dest=DIR hardlink to files in DIR when unchanged\n"); @@ -383,7 +383,7 @@ the file's name. rprintf(F," -z, --compress compress file data during the transfer\n"); rprintf(F," -C, --cvs-exclude auto-ignore files the same way CVS does\n"); rprintf(F," -f, --filter=RULE add a file-filtering RULE\n"); -@@ -345,7 +347,7 @@ void usage(enum logcode F) +@@ -348,7 +350,7 @@ void usage(enum logcode F) enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM, OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST, OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, @@ -392,7 +392,7 @@ the file's name. OPT_REFUSED_BASE = 9000}; static struct poptOption long_options[] = { -@@ -413,6 +415,7 @@ static struct poptOption long_options[] +@@ -416,6 +418,7 @@ static struct poptOption long_options[] {"compare-dest", 0, POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 }, {"copy-dest", 0, POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 }, {"link-dest", 0, POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 }, @@ -400,7 +400,7 @@ the file's name. {"fuzzy", 'y', POPT_ARG_NONE, &fuzzy_basis, 0, 0, 0 }, /* TODO: Should this take an optional int giving the compression level? */ {"compress", 'z', POPT_ARG_NONE, &do_compression, 0, 0, 0 }, -@@ -834,6 +837,21 @@ int parse_arguments(int *argc, const cha +@@ -840,6 +843,21 @@ int parse_arguments(int *argc, const cha basis_dir[basis_dir_cnt++] = (char *)arg; break; @@ -422,7 +422,7 @@ the file's name. default: /* A large opt value means that set_refuse_options() * turned this option off. */ -@@ -1369,6 +1387,11 @@ void server_options(char **args,int *arg +@@ -1392,6 +1410,11 @@ void server_options(char **args,int *arg } } @@ -434,9 +434,9 @@ the file's name. if (files_from && (!am_sender || remote_filesfrom_file)) { if (remote_filesfrom_file) { args[ac++] = "--files-from"; ---- orig/receiver.c 2005-02-14 02:45:10 +--- orig/receiver.c 2005-02-16 15:35:53 +++ receiver.c 2005-01-15 21:29:13 -@@ -35,6 +35,7 @@ extern int preserve_hard_links; +@@ -37,6 +37,7 @@ extern int preserve_hard_links; extern int preserve_perms; extern int io_error; extern char *tmpdir; @@ -444,7 +444,7 @@ the file's name. extern char *partial_dir; extern char *basis_dir[]; extern int basis_dir_cnt; -@@ -137,12 +138,13 @@ static int get_tmpname(char *fnametmp, c +@@ -140,12 +141,13 @@ static int get_tmpname(char *fnametmp, c static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r, @@ -459,7 +459,7 @@ the file's name. int32 len; OFF_T offset = 0; OFF_T offset2; -@@ -162,6 +164,9 @@ static int receive_data(int f_in, char * +@@ -165,6 +167,9 @@ static int receive_data(int f_in, char * } else mapbuf = NULL; @@ -469,7 +469,7 @@ the file's name. sum_init(checksum_seed); while ((i = recv_token(f_in, &data)) != 0) { -@@ -178,6 +183,8 @@ static int receive_data(int f_in, char * +@@ -181,6 +186,8 @@ static int receive_data(int f_in, char * cleanup_got_literal = 1; sum_update(data, i); @@ -478,7 +478,7 @@ the file's name. if (fd != -1 && write_file(fd,data,i) != i) goto report_write_error; -@@ -204,6 +211,8 @@ static int receive_data(int f_in, char * +@@ -207,6 +214,8 @@ static int receive_data(int f_in, char * see_token(map, len); sum_update(map, len); @@ -487,7 +487,7 @@ the file's name. } if (inplace) { -@@ -244,6 +253,8 @@ static int receive_data(int f_in, char * +@@ -247,6 +256,8 @@ static int receive_data(int f_in, char * } sum_end(file_sum1); @@ -496,7 +496,7 @@ the file's name. if (mapbuf) unmap_file(mapbuf); -@@ -289,7 +300,7 @@ static void read_gen_name(int fd, char * +@@ -292,7 +303,7 @@ static void read_gen_name(int fd, char * static void discard_receive_data(int f_in, OFF_T length) { @@ -505,7 +505,7 @@ the file's name. } -@@ -535,8 +546,12 @@ int recv_files(int f_in, struct file_lis +@@ -555,8 +566,12 @@ int recv_files(int f_in, struct file_lis rprintf(FINFO, "%s\n", safe_fname(fname)); /* recv file data */ @@ -517,8 +517,8 @@ the file's name. - fname, fd2, file->length); + fname, fd2, file->length, file->u.sum); - log_recv(file, &initial_stats); - + if (!log_before_transfer) + log_recv(file, &initial_stats, iflags); --- orig/rsync.c 2005-02-14 02:45:10 +++ rsync.c 2005-02-07 21:11:30 @@ -36,6 +36,7 @@ extern int force_delete; @@ -543,9 +543,9 @@ the file's name. if (ret < 0) { rsyserr(FERROR, errno, "%s %s -> \"%s\"", ret == -2 ? "copy" : "rename", ---- orig/rsync.h 2005-02-14 02:45:10 +--- orig/rsync.h 2005-02-16 15:35:54 +++ rsync.h 2004-07-03 20:20:15 -@@ -605,6 +605,14 @@ struct stats { +@@ -618,6 +618,14 @@ struct stats { int current_file_index; }; @@ -560,7 +560,7 @@ the file's name. #include "byteorder.h" #include "lib/mdfour.h" ---- orig/rsync.yo 2005-02-14 02:45:11 +--- orig/rsync.yo 2005-02-16 15:35:54 +++ rsync.yo 2005-02-13 06:58:47 @@ -355,6 +355,7 @@ to the detailed description below for a --compare-dest=DIR also compare received files relative to DIR -- 2.34.1