1 This patch adds the --append option, which works like a "resume" mode in
2 an ftp client, appending new data onto the end of the files it updates.
4 --- orig/generator.c 2005-02-20 22:13:19
5 +++ generator.c 2005-02-15 19:31:13
6 @@ -46,6 +46,7 @@ extern int remove_sent_files;
7 extern int update_only;
8 extern int opt_ignore_existing;
10 +extern int append_mode;
11 extern int make_backups;
12 extern int csum_length;
13 extern int ignore_times;
14 @@ -243,35 +244,42 @@ static void generate_and_send_sums(int f
17 sum_sizes_sqroot(&sum, len);
18 + write_sum_head(f_out, &sum);
20 + if (append_mode > 0 && f_copy < 0)
24 mapbuf = map_file(fd, len, MAX_MAP_SIZE, sum.blength);
28 - write_sum_head(f_out, &sum);
30 for (i = 0; i < sum.count; i++) {
31 int32 n1 = (int32)MIN(len, (OFF_T)sum.blength);
32 char *map = map_ptr(mapbuf, offset, n1);
33 - uint32 sum1 = get_checksum1(map, n1);
34 char sum2[SUM_LENGTH];
42 full_write(f_copy, map, n1);
43 + if (append_mode > 0)
47 + sum1 = get_checksum1(map, n1);
48 get_checksum2(map, n1, sum2);
52 "chunk[%.0f] offset=%.0f len=%ld sum1=%08lx\n",
53 - (double)i, (double)offset, (long)n1,
54 + (double)i, (double)offset - n1, (long)n1,
57 write_int(f_out, sum1);
58 write_buf(f_out, sum2, sum.s2length);
64 @@ -731,6 +739,9 @@ static void recv_generator(char *fname,
68 + if (append_mode && st.st_size > file->length)
71 if (!compare_dest && fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH)
73 else if (fnamecmp_type == FNAMECMP_FUZZY)
74 @@ -757,7 +768,7 @@ prepare_to_open:
76 if (dry_run || read_batch)
78 - if (whole_file > 0) {
79 + if (whole_file > 0 && !append_mode) {
83 @@ -923,6 +934,9 @@ void generate_files(int f_out, struct fi
84 csum_length = SUM_LENGTH;
85 only_existing = max_size = opt_ignore_existing = 0;
86 update_only = always_checksum = size_only = 0;
87 + make_backups = 0; /* avoid a duplicate backup in inplace mode */
88 + if (append_mode) /* resend w/o append mode */
89 + append_mode = -1; /* ... but only longer files */
93 --- orig/match.c 2005-02-15 19:27:04
94 +++ match.c 2005-02-11 20:26:31
95 @@ -23,6 +23,7 @@ extern int verbose;
97 extern int do_progress;
98 extern int checksum_seed;
99 +extern int append_mode;
101 int updating_basis_file;
103 @@ -334,6 +335,21 @@ void match_sums(int f, struct sum_struct
105 sum_init(checksum_seed);
109 + for (j = CHUNK_SIZE; j < s->flength; j += CHUNK_SIZE) {
110 + sum_update(map_ptr(buf, last_match, CHUNK_SIZE),
114 + if (last_match < s->flength) {
115 + int32 len = s->flength - last_match;
116 + sum_update(map_ptr(buf, last_match, len), len);
117 + last_match = s->flength;
122 if (len > 0 && s->count > 0) {
125 @@ -347,7 +363,7 @@ void match_sums(int f, struct sum_struct
128 /* by doing this in pieces we avoid too many seeks */
129 - for (j = CHUNK_SIZE; j < len; j += CHUNK_SIZE)
130 + for (j = last_match + CHUNK_SIZE; j < len; j += CHUNK_SIZE)
131 matched(f, s, buf, j, -2);
132 matched(f, s, buf, len, -1);
134 --- orig/options.c 2005-02-20 01:12:42
135 +++ options.c 2005-02-16 15:36:40
136 @@ -39,6 +39,7 @@ int make_backups = 0;
140 +int append_mode = 0;
141 int archive_mode = 0;
142 int keep_dirlinks = 0;
144 @@ -158,6 +159,7 @@ static int F_option_cnt = 0;
145 static int modify_window_set;
146 static int refused_delete, refused_archive_part;
147 static int refused_partial, refused_progress, refused_delete_before;
148 +static int refused_inplace;
149 static char *dest_option = NULL;
150 static char *max_size_arg;
151 static char partialdir_for_delayupdate[] = ".~tmp~";
152 @@ -267,6 +269,7 @@ void usage(enum logcode F)
153 rprintf(F," --suffix=SUFFIX set backup suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX);
154 rprintf(F," -u, --update skip files that are newer on the receiver\n");
155 rprintf(F," --inplace update destination files in-place (SEE MAN PAGE)\n");
156 + rprintf(F," --append append data onto shorter files\n");
157 rprintf(F," -d, --dirs transfer directories without recursing\n");
158 rprintf(F," -l, --links copy symlinks as symlinks\n");
159 rprintf(F," -L, --copy-links transform symlink into referent file/dir\n");
160 @@ -394,6 +397,7 @@ static struct poptOption long_options[]
161 {"links", 'l', POPT_ARG_NONE, &preserve_links, 0, 0, 0 },
162 {"copy-links", 'L', POPT_ARG_NONE, ©_links, 0, 0, 0 },
163 {"keep-dirlinks", 'K', POPT_ARG_NONE, &keep_dirlinks, 0, 0, 0 },
164 + {"append", 0, POPT_ARG_VAL, &append_mode, 1, 0, 0 },
165 {"whole-file", 'W', POPT_ARG_VAL, &whole_file, 1, 0, 0 },
166 {"no-whole-file", 0, POPT_ARG_VAL, &whole_file, 0, 0, 0 },
167 {"copy-unsafe-links",0, POPT_ARG_NONE, ©_unsafe_links, 0, 0, 0 },
168 @@ -566,6 +570,8 @@ static void set_refuse_options(char *bp)
169 refused_partial = op->val;
170 else if (wildmatch("progress", op->longName))
171 refused_progress = op->val;
172 + else if (wildmatch("inplace", op->longName))
173 + refused_inplace = op->val;
177 @@ -1114,6 +1120,14 @@ int parse_arguments(int *argc, const cha
178 bwlimit_writemax = 512;
182 + if (refused_inplace) {
183 + create_refuse_error(refused_inplace);
189 if (delay_updates && !partial_dir)
190 partial_dir = partialdir_for_delayupdate;
192 @@ -1411,7 +1425,9 @@ void server_options(char **args,int *arg
193 if (opt_ignore_existing && am_sender)
194 args[ac++] = "--ignore-existing";
198 + args[ac++] = "--append";
200 args[ac++] = "--inplace";
203 --- orig/receiver.c 2005-02-20 20:55:51
204 +++ receiver.c 2005-02-11 20:26:32
205 @@ -45,6 +45,7 @@ extern int remove_sent_files;
206 extern int module_id;
207 extern int ignore_errors;
208 extern int orig_umask;
209 +extern int append_mode;
210 extern int keep_partial;
211 extern int checksum_seed;
213 @@ -233,6 +234,28 @@ static int receive_data(int f_in, char *
215 sum_init(checksum_seed);
219 + sum.flength = (OFF_T)sum.count * sum.blength;
221 + sum.flength -= sum.blength - sum.remainder;
222 + for (j = CHUNK_SIZE; j < sum.flength; j += CHUNK_SIZE) {
223 + sum_update(map_ptr(mapbuf, offset, CHUNK_SIZE),
227 + if (offset < sum.flength) {
228 + int32 len = sum.flength - offset;
229 + sum_update(map_ptr(mapbuf, offset, len), len);
230 + offset = sum.flength;
232 + if (fd != -1 && do_lseek(fd, offset, SEEK_SET) != offset) {
233 + rsyserr(FERROR, errno, "lseek failed on %s",
234 + full_fname(fname));
235 + exit_cleanup(RERR_FILEIO);
239 while ((i = recv_token(f_in, &data)) != 0) {
241 show_progress(offset, total_size);
242 @@ -422,6 +445,7 @@ int recv_files(int f_in, struct file_lis
243 send_msg(MSG_DONE, "", 0);
244 if (keep_partial && !partial_dir)
245 make_backups = 0; /* prevents double backup */
250 --- orig/rsync.yo 2005-02-20 01:12:43
251 +++ rsync.yo 2005-02-11 20:36:38
252 @@ -309,6 +309,7 @@ to the detailed description below for a
253 --suffix=SUFFIX backup suffix (default ~ w/o --backup-dir)
254 -u, --update skip files that are newer on the receiver
255 --inplace update destination files in-place
256 + --append append data onto shorter files
257 -d, --dirs transfer directories without recursing
258 -l, --links copy symlinks as symlinks
259 -L, --copy-links transform symlink into referent file/dir
260 @@ -565,6 +566,14 @@ should not use this option to update fil
261 rsync will be unable to update a file in-place that is not writable by the
264 +dit(bf(--append)) This causes rsync to update a file by appending data onto
265 +the end of the file, which presumes that the data that already exists on
266 +the receiving side is identical with the start of the file on the sending
267 +side. If that is not true, the file will fail the checksum check, and a
268 +normal bf(--inplace) update will correct the mismatch. Any file on the
269 +receiving side that is longer than a file on the sending side is skipped.
270 +Implies bf(--inplace).
272 dit(bf(-d, --dirs)) Tell the sending side to include any directories that
273 are encountered. Unlike bf(--recursive), a directory's contents are not copied
274 unless the directory was specified on the command-line as either "." or a
275 --- orig/sender.c 2005-02-20 01:12:43
276 +++ sender.c 2005-02-20 00:17:01
277 @@ -28,6 +28,7 @@ extern int log_format_has_i;
278 extern int daemon_log_format_has_i;
279 extern int csum_length;
281 +extern int append_mode;
282 extern int protocol_version;
283 extern int remove_sent_files;
284 extern int updating_basis_file;
285 @@ -67,6 +68,13 @@ static struct sum_struct *receive_sums(i
286 (double)s->count, (long)s->blength, (long)s->remainder);
290 + s->flength = (OFF_T)s->count * s->blength;
292 + s->flength -= s->blength - s->remainder;
299 @@ -161,6 +169,7 @@ void send_files(struct file_list *flist,
300 /* For inplace: redo phase turns off the backup
301 * flag so that we do a regular inplace send. */