From 699c8be0530dc08762600ea539ac8a5ba50c2883 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Sun, 20 Feb 2005 03:04:06 +0000 Subject: [PATCH] Got rid of patch fuzz. --- append.diff | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/append.diff b/append.diff index 951c2c1..c0c9a9b 100644 --- a/append.diff +++ b/append.diff @@ -1,9 +1,9 @@ This patch adds the --append option, which works like a "resume" mode in an ftp client, appending new data onto the end of the files it updates. ---- orig/generator.c 2005-02-20 00:02:23 +--- orig/generator.c 2005-02-20 01:12:42 +++ generator.c 2005-02-15 19:31:13 -@@ -45,6 +45,7 @@ extern int delete_during; +@@ -46,6 +46,7 @@ extern int remove_sent_files; extern int update_only; extern int opt_ignore_existing; extern int inplace; @@ -11,7 +11,7 @@ an ftp client, appending new data onto the end of the files it updates. extern int make_backups; extern int csum_length; extern int ignore_times; -@@ -242,35 +243,42 @@ static void generate_and_send_sums(int f +@@ -243,35 +244,42 @@ static void generate_and_send_sums(int f OFF_T offset = 0; sum_sizes_sqroot(&sum, len); @@ -61,7 +61,7 @@ an ftp client, appending new data onto the end of the files it updates. } if (mapbuf) -@@ -729,6 +737,9 @@ static void recv_generator(char *fname, +@@ -731,6 +739,9 @@ static void recv_generator(char *fname, return; } @@ -71,7 +71,7 @@ an ftp client, appending new data onto the end of the files it updates. if (!compare_dest && fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH) ; else if (fnamecmp_type == FNAMECMP_FUZZY) -@@ -755,7 +766,7 @@ prepare_to_open: +@@ -757,7 +768,7 @@ prepare_to_open: if (dry_run || read_batch) goto notify_others; @@ -80,7 +80,7 @@ an ftp client, appending new data onto the end of the files it updates. if (statret == 0) statret = 1; goto notify_others; -@@ -921,6 +932,9 @@ void generate_files(int f_out, struct fi +@@ -923,6 +934,9 @@ void generate_files(int f_out, struct fi csum_length = SUM_LENGTH; only_existing = max_size = opt_ignore_existing = 0; update_only = always_checksum = size_only = 0; @@ -131,7 +131,7 @@ an ftp client, appending new data onto the end of the files it updates. matched(f, s, buf, j, -2); matched(f, s, buf, len, -1); } ---- orig/options.c 2005-02-20 00:02:23 +--- orig/options.c 2005-02-20 01:12:42 +++ options.c 2005-02-16 15:36:40 @@ -39,6 +39,7 @@ int make_backups = 0; **/ @@ -141,7 +141,7 @@ an ftp client, appending new data onto the end of the files it updates. int archive_mode = 0; int keep_dirlinks = 0; int copy_links = 0; -@@ -156,6 +157,7 @@ static int F_option_cnt = 0; +@@ -158,6 +159,7 @@ static int F_option_cnt = 0; static int modify_window_set; static int refused_delete, refused_archive_part; static int refused_partial, refused_progress, refused_delete_before; @@ -149,7 +149,7 @@ an ftp client, appending new data onto the end of the files it updates. static char *dest_option = NULL; static char *max_size_arg; static char partialdir_for_delayupdate[] = ".~tmp~"; -@@ -265,6 +267,7 @@ void usage(enum logcode F) +@@ -267,6 +269,7 @@ void usage(enum logcode F) rprintf(F," --suffix=SUFFIX set backup suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX); 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"); @@ -157,7 +157,7 @@ an ftp client, appending new data onto the end of the files it updates. rprintf(F," -d, --dirs transfer directories without recursing\n"); rprintf(F," -l, --links copy symlinks as symlinks\n"); rprintf(F," -L, --copy-links transform symlink into referent file/dir\n"); -@@ -390,6 +393,7 @@ static struct poptOption long_options[] +@@ -394,6 +397,7 @@ static struct poptOption long_options[] {"links", 'l', POPT_ARG_NONE, &preserve_links, 0, 0, 0 }, {"copy-links", 'L', POPT_ARG_NONE, ©_links, 0, 0, 0 }, {"keep-dirlinks", 'K', POPT_ARG_NONE, &keep_dirlinks, 0, 0, 0 }, @@ -165,7 +165,7 @@ an ftp client, appending new data onto the end of the files it updates. {"whole-file", 'W', POPT_ARG_VAL, &whole_file, 1, 0, 0 }, {"no-whole-file", 0, POPT_ARG_VAL, &whole_file, 0, 0, 0 }, {"copy-unsafe-links",0, POPT_ARG_NONE, ©_unsafe_links, 0, 0, 0 }, -@@ -562,6 +566,8 @@ static void set_refuse_options(char *bp) +@@ -566,6 +570,8 @@ static void set_refuse_options(char *bp) refused_partial = op->val; else if (wildmatch("progress", op->longName)) refused_progress = op->val; @@ -174,7 +174,7 @@ an ftp client, appending new data onto the end of the files it updates. break; } if (!is_wild) -@@ -1099,6 +1105,14 @@ int parse_arguments(int *argc, const cha +@@ -1114,6 +1120,14 @@ int parse_arguments(int *argc, const cha bwlimit_writemax = 512; } @@ -189,7 +189,7 @@ an ftp client, appending new data onto the end of the files it updates. if (delay_updates && !partial_dir) partial_dir = partialdir_for_delayupdate; -@@ -1396,7 +1410,9 @@ void server_options(char **args,int *arg +@@ -1411,7 +1425,9 @@ void server_options(char **args,int *arg if (opt_ignore_existing && am_sender) args[ac++] = "--ignore-existing"; @@ -200,9 +200,9 @@ an ftp client, appending new data onto the end of the files it updates. args[ac++] = "--inplace"; if (tmpdir) { ---- orig/receiver.c 2005-02-20 00:16:35 +--- orig/receiver.c 2005-02-20 02:54:54 +++ receiver.c 2005-02-11 20:26:32 -@@ -44,6 +44,7 @@ extern int cleanup_got_literal; +@@ -45,6 +45,7 @@ extern int remove_sent_files; extern int module_id; extern int ignore_errors; extern int orig_umask; @@ -210,7 +210,7 @@ an ftp client, appending new data onto the end of the files it updates. extern int keep_partial; extern int checksum_seed; extern int inplace; -@@ -169,6 +170,28 @@ static int receive_data(int f_in, char * +@@ -170,6 +171,28 @@ static int receive_data(int f_in, char * sum_init(checksum_seed); @@ -239,7 +239,7 @@ an ftp client, appending new data onto the end of the files it updates. while ((i = recv_token(f_in, &data)) != 0) { if (do_progress) show_progress(offset, total_size); -@@ -363,6 +386,7 @@ int recv_files(int f_in, struct file_lis +@@ -364,6 +387,7 @@ int recv_files(int f_in, struct file_lis send_msg(MSG_DONE, "", 0); if (keep_partial && !partial_dir) make_backups = 0; /* prevents double backup */ @@ -247,7 +247,7 @@ an ftp client, appending new data onto the end of the files it updates. continue; } ---- orig/rsync.yo 2005-02-19 09:27:49 +--- orig/rsync.yo 2005-02-20 01:12:43 +++ rsync.yo 2005-02-11 20:36:38 @@ -309,6 +309,7 @@ to the detailed description below for a --suffix=SUFFIX backup suffix (default ~ w/o --backup-dir) @@ -257,7 +257,7 @@ an ftp client, appending new data onto the end of the files it updates. -d, --dirs transfer directories without recursing -l, --links copy symlinks as symlinks -L, --copy-links transform symlink into referent file/dir -@@ -564,6 +565,14 @@ should not use this option to update fil +@@ -565,6 +566,14 @@ should not use this option to update fil rsync will be unable to update a file in-place that is not writable by the receiving user. @@ -272,7 +272,7 @@ an ftp client, appending new data onto the end of the files it updates. dit(bf(-d, --dirs)) Tell the sending side to include any directories that are encountered. Unlike bf(--recursive), a directory's contents are not copied unless the directory was specified on the command-line as either "." or a ---- orig/sender.c 2005-02-20 00:16:35 +--- orig/sender.c 2005-02-20 01:12:43 +++ sender.c 2005-02-20 00:17:01 @@ -28,6 +28,7 @@ extern int log_format_has_i; extern int daemon_log_format_has_i; @@ -280,9 +280,9 @@ an ftp client, appending new data onto the end of the files it updates. extern int io_error; +extern int append_mode; extern int protocol_version; + extern int remove_sent_files; extern int updating_basis_file; - extern int make_backups; -@@ -66,6 +67,13 @@ static struct sum_struct *receive_sums(i +@@ -67,6 +68,13 @@ static struct sum_struct *receive_sums(i (double)s->count, (long)s->blength, (long)s->remainder); } @@ -296,7 +296,7 @@ an ftp client, appending new data onto the end of the files it updates. if (s->count == 0) return(s); -@@ -133,6 +141,7 @@ void send_files(struct file_list *flist, +@@ -161,6 +169,7 @@ void send_files(struct file_list *flist, /* For inplace: redo phase turns off the backup * flag so that we do a regular inplace send. */ make_backups = 0; -- 2.34.1