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 22:13:19
-+++ generator.c 2005-02-15 19:31:13
-@@ -46,6 +46,7 @@ extern int remove_sent_files;
+--- orig/generator.c 2005-03-17 09:05:21
++++ generator.c 2005-03-03 02:59:17
+@@ -51,6 +51,7 @@ extern int remove_sent_files;
extern int update_only;
extern int opt_ignore_existing;
extern int inplace;
extern int make_backups;
extern int csum_length;
extern int ignore_times;
-@@ -243,35 +244,42 @@ static void generate_and_send_sums(int f
+@@ -466,35 +467,42 @@ static void generate_and_send_sums(int f
OFF_T offset = 0;
sum_sizes_sqroot(&sum, len);
}
if (mapbuf)
-@@ -731,6 +739,9 @@ static void recv_generator(char *fname,
+@@ -973,6 +981,9 @@ static void recv_generator(char *fname,
return;
}
if (!compare_dest && fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH)
;
else if (fnamecmp_type == FNAMECMP_FUZZY)
-@@ -757,7 +768,7 @@ prepare_to_open:
+@@ -1143,7 +1154,7 @@ void generate_files(int f_out, struct fi
+ if (delete_before && !local_name && flist->count > 0)
+ do_delete_pass(flist);
- if (dry_run || read_batch)
- goto notify_others;
-- if (whole_file > 0) {
-+ if (whole_file > 0 && !append_mode) {
- if (statret == 0)
- statret = 1;
- goto notify_others;
-@@ -923,6 +934,9 @@ void generate_files(int f_out, struct fi
- csum_length = SUM_LENGTH;
+- if (whole_file < 0)
++ if (append_mode || whole_file < 0)
+ whole_file = 0;
+ if (verbose >= 2) {
+ rprintf(FINFO, "delta-transmission %s\n",
+@@ -1194,6 +1205,8 @@ void generate_files(int f_out, struct fi
only_existing = max_size = opt_ignore_existing = 0;
update_only = always_checksum = size_only = 0;
-+ make_backups = 0; /* avoid a duplicate backup in inplace mode */
+ ignore_times = 1;
+ if (append_mode) /* resend w/o append mode */
+ append_mode = -1; /* ... but only longer files */
- ignore_times = 1;
+ make_backups = 0; /* avoid a duplicate backup for inplace processing */
- if (verbose > 2)
---- orig/match.c 2005-02-15 19:27:04
+ /* We expect to just sit around now, so don't exit on a timeout.
+--- orig/match.c 2005-03-05 17:51:23
+++ match.c 2005-02-11 20:26:31
@@ -23,6 +23,7 @@ extern int verbose;
extern int am_server;
int updating_basis_file;
-@@ -334,6 +335,21 @@ void match_sums(int f, struct sum_struct
+@@ -330,6 +331,21 @@ void match_sums(int f, struct sum_struct
sum_init(checksum_seed);
if (len > 0 && s->count > 0) {
build_hash_table(s);
-@@ -347,7 +363,7 @@ void match_sums(int f, struct sum_struct
+@@ -343,7 +359,7 @@ void match_sums(int f, struct sum_struct
} else {
OFF_T j;
/* by doing this in pieces we avoid too many seeks */
matched(f, s, buf, j, -2);
matched(f, s, buf, len, -1);
}
---- orig/options.c 2005-02-20 01:12:42
-+++ options.c 2005-02-16 15:36:40
+--- orig/options.c 2005-03-24 16:41:46
++++ options.c 2005-03-11 11:21:34
@@ -39,6 +39,7 @@ int make_backups = 0;
**/
int whole_file = -1;
int archive_mode = 0;
int keep_dirlinks = 0;
int copy_links = 0;
-@@ -158,6 +159,7 @@ static int F_option_cnt = 0;
+@@ -165,6 +166,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;
+static int refused_inplace;
- static char *dest_option = NULL;
static char *max_size_arg;
static char partialdir_for_delayupdate[] = ".~tmp~";
-@@ -267,6 +269,7 @@ void usage(enum logcode F)
+
+@@ -273,6 +275,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");
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");
-@@ -394,6 +397,7 @@ static struct poptOption long_options[]
+@@ -400,6 +403,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 },
{"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 },
-@@ -566,6 +570,8 @@ static void set_refuse_options(char *bp)
+@@ -574,6 +578,8 @@ static void set_refuse_options(char *bp)
refused_partial = op->val;
else if (wildmatch("progress", op->longName))
refused_progress = op->val;
break;
}
if (!is_wild)
-@@ -1114,6 +1120,14 @@ int parse_arguments(int *argc, const cha
+@@ -1108,6 +1114,14 @@ int parse_arguments(int *argc, const cha
bwlimit_writemax = 512;
}
if (delay_updates && !partial_dir)
partial_dir = partialdir_for_delayupdate;
-@@ -1411,7 +1425,9 @@ void server_options(char **args,int *arg
+@@ -1418,7 +1432,9 @@ void server_options(char **args,int *arg
if (opt_ignore_existing && am_sender)
args[ac++] = "--ignore-existing";
args[ac++] = "--inplace";
if (tmpdir) {
---- orig/receiver.c 2005-02-20 20:55:51
+--- orig/receiver.c 2005-03-24 16:41:46
+++ receiver.c 2005-02-11 20:26:32
-@@ -45,6 +45,7 @@ extern int remove_sent_files;
+@@ -44,6 +44,7 @@ extern int remove_sent_files;
extern int module_id;
extern int ignore_errors;
extern int orig_umask;
extern int keep_partial;
extern int checksum_seed;
extern int inplace;
-@@ -233,6 +234,28 @@ static int receive_data(int f_in, char *
+@@ -210,6 +211,28 @@ static int receive_data(int f_in, char *
sum_init(checksum_seed);
while ((i = recv_token(f_in, &data)) != 0) {
if (do_progress)
show_progress(offset, total_size);
-@@ -422,6 +445,7 @@ int recv_files(int f_in, struct file_lis
+@@ -399,6 +422,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 */
continue;
}
---- orig/rsync.yo 2005-02-20 01:12:43
+--- orig/rsync.yo 2005-03-16 02:19:30
+++ rsync.yo 2005-02-11 20:36:38
-@@ -309,6 +309,7 @@ to the detailed description below for a
+@@ -308,6 +308,7 @@ to the detailed description below for a
--suffix=SUFFIX backup suffix (default ~ w/o --backup-dir)
-u, --update skip files that are newer on the receiver
--inplace update destination files in-place
-d, --dirs transfer directories without recursing
-l, --links copy symlinks as symlinks
-L, --copy-links transform symlink into referent file/dir
-@@ -565,6 +566,14 @@ should not use this option to update fil
+@@ -564,6 +565,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.
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 01:12:43
-+++ sender.c 2005-02-20 00:17:01
+--- orig/sender.c 2005-03-16 02:19:30
++++ sender.c 2005-03-16 02:25:18
@@ -28,6 +28,7 @@ extern int log_format_has_i;
extern int daemon_log_format_has_i;
extern int csum_length;
extern int protocol_version;
extern int remove_sent_files;
extern int updating_basis_file;
-@@ -67,6 +68,13 @@ static struct sum_struct *receive_sums(i
+@@ -68,6 +69,13 @@ static struct sum_struct *receive_sums(i
(double)s->count, (long)s->blength, (long)s->remainder);
}
if (s->count == 0)
return(s);
-@@ -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;
-+ append_mode = 0;
- continue;
- }
- break;
+@@ -235,6 +243,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;
++ append_mode = 0;
+ continue;
+ }
+
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff