-
Notifications
You must be signed in to change notification settings - Fork 8
/
checksum-updating.diff
652 lines (605 loc) · 20.5 KB
/
checksum-updating.diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
This builds on the checksum-reading patch and adds the ability to
create and/or update the .rsyncsums files using extended mode args to
the --sumfiles=MODE option and the "checksum files = MODE" daemon
parameter.
CAUTION: This patch is only lightly tested. If you're interested
in using it, please help out.
To use this patch, run these commands for a successful build:
patch -p1 <patches/checksum-reading.diff
patch -p1 <patches/checksum-updating.diff
./configure (optional if already run)
make
TODO:
- Fix the code that removes .rsyncsums files when a dir becomes empty.
based-on: patch/master/checksum-reading
diff --git a/flist.c b/flist.c
--- a/flist.c
+++ b/flist.c
@@ -27,6 +27,7 @@
#include "inums.h"
#include "io.h"
+extern int dry_run;
extern int am_root;
extern int am_server;
extern int am_daemon;
@@ -112,6 +113,9 @@ extern iconv_t ic_send, ic_recv;
#define PTR_SIZE (sizeof (struct file_struct *))
+#define FLAG_SUM_MISSING (1<<1) /* F_SUM() data is undefined */
+#define FLAG_SUM_KEEP (1<<2) /* keep entry when rewriting */
+
int io_error;
int flist_csum_len;
dev_t filesystem_dev; /* used to implement -x */
@@ -154,8 +158,13 @@ static char empty_sum[MAX_DIGEST_LEN];
static int flist_count_offset; /* for --delete --progress */
static int show_filelist_progress;
+#define REGULAR_SKIPPED(flist) ((flist)->to_redo)
+
static struct csum_cache {
struct file_list *flist;
+ const char *dirname;
+ int checksum_matches;
+ int checksum_updates;
} *csum_cache = NULL;
static struct file_list *flist_new(int flags, const char *msg);
@@ -351,7 +360,79 @@ static void flist_done_allocating(struct file_list *flist)
flist->pool_boundary = ptr;
}
-void reset_checksum_cache()
+static void checksum_filename(int slot, const char *dirname, char *fbuf)
+{
+ if (dirname && *dirname) {
+ unsigned int len;
+ if (slot) {
+ len = strlcpy(fbuf, basis_dir[slot-1], MAXPATHLEN);
+ if (len >= MAXPATHLEN)
+ return;
+ } else
+ len = 0;
+ if (pathjoin(fbuf+len, MAXPATHLEN-len, dirname, RSYNCSUMS_FILE) >= MAXPATHLEN-len)
+ return;
+ } else
+ strlcpy(fbuf, RSYNCSUMS_FILE, MAXPATHLEN);
+}
+
+static void write_checksums(int slot, struct file_list *flist, int whole_dir)
+{
+ int i;
+ FILE *out_fp;
+ char fbuf[MAXPATHLEN];
+ int new_entries = csum_cache[slot].checksum_updates != 0;
+ int counts_match = flist->used == csum_cache[slot].checksum_matches;
+ int no_skipped = whole_dir && REGULAR_SKIPPED(flist) == 0;
+ const char *dirname = csum_cache[slot].dirname;
+
+ flist_sort_and_clean(flist, 0);
+
+ if (dry_run && !(checksum_files & CSF_AFFECT_DRYRUN))
+ return;
+
+ checksum_filename(slot, dirname, fbuf);
+
+ if (flist->high - flist->low < 0 && no_skipped) {
+ unlink(fbuf);
+ return;
+ }
+
+ if (!new_entries && (counts_match || !whole_dir))
+ return;
+
+ if (!(out_fp = fopen(fbuf, "w")))
+ return;
+
+ for (i = flist->low; i <= flist->high; i++) {
+ struct file_struct *file = flist->sorted[i];
+ const char *cp = F_SUM(file);
+ const char *end = cp + flist_csum_len;
+ const char *alt_sum = file->basename + strlen(file->basename) + 1;
+ if (whole_dir && !(file->flags & FLAG_SUM_KEEP))
+ continue;
+ if (file_sum_nni->num == CSUM_MD5)
+ fprintf(out_fp, "%s ", alt_sum);
+ if (file->flags & FLAG_SUM_MISSING) {
+ do {
+ fputs("==", out_fp);
+ } while (++cp != end);
+ } else {
+ do {
+ fprintf(out_fp, "%02x", (int)CVAL(cp, 0));
+ } while (++cp != end);
+ }
+ if (file_sum_nni->num < CSUM_MD5)
+ fprintf(out_fp, " %s", alt_sum);
+ fprintf(out_fp, " %10.0f %10.0f %10lu %10lu %s\n",
+ (double)F_LENGTH(file), (double)file->modtime,
+ (long)F_CTIME(file), (long)F_INODE(file), file->basename);
+ }
+
+ fclose(out_fp);
+}
+
+void reset_checksum_cache(int whole_dir)
{
int slot, slots = am_sender ? 1 : basis_dir_cnt + 1;
@@ -362,6 +443,9 @@ void reset_checksum_cache()
struct file_list *flist = csum_cache[slot].flist;
if (flist) {
+ if (checksum_files & CSF_UPDATE && flist->next)
+ write_checksums(slot, flist, whole_dir);
+
/* Reset the pool memory and empty the file-list array. */
pool_free_old(flist->file_pool,
pool_boundary(flist->file_pool, 0));
@@ -372,6 +456,10 @@ void reset_checksum_cache()
flist->low = 0;
flist->high = -1;
flist->next = NULL;
+
+ csum_cache[slot].checksum_matches = 0;
+ csum_cache[slot].checksum_updates = 0;
+ REGULAR_SKIPPED(flist) = 0;
}
}
@@ -379,7 +467,7 @@ void reset_checksum_cache()
static int add_checksum(struct file_list *flist, const char *dirname,
const char *basename, int basename_len, OFF_T file_length,
time_t mtime, uint32 ctime, uint32 inode,
- const char *sum)
+ const char *sum, const char *alt_sum, int flags)
{
struct file_struct *file;
int alloc_len, extra_len;
@@ -396,7 +484,7 @@ static int add_checksum(struct file_list *flist, const char *dirname,
if (extra_len & (EXTRA_ROUNDING * EXTRA_LEN))
extra_len = (extra_len | (EXTRA_ROUNDING * EXTRA_LEN)) + EXTRA_LEN;
#endif
- alloc_len = FILE_STRUCT_LEN + extra_len + basename_len;
+ alloc_len = FILE_STRUCT_LEN + extra_len + basename_len + flist_csum_len*2 + 1;
bp = pool_alloc(flist->file_pool, alloc_len, "add_checksum");
memset(bp, 0, extra_len + FILE_STRUCT_LEN);
@@ -405,7 +493,14 @@ static int add_checksum(struct file_list *flist, const char *dirname,
bp += FILE_STRUCT_LEN;
memcpy(bp, basename, basename_len);
+ if (alt_sum)
+ strlcpy(bp+basename_len, alt_sum, flist_csum_len*2 + 1);
+ else {
+ memset(bp+basename_len, '=', flist_csum_len*2);
+ bp[basename_len+flist_csum_len*2] = '\0';
+ }
+ file->flags = flags;
file->mode = S_IFREG;
file->modtime = mtime;
file->len32 = (uint32)file_length;
@@ -434,10 +529,11 @@ static void read_checksums(int slot, struct file_list *flist, const char *dirnam
char line[MAXPATHLEN+1024], fbuf[MAXPATHLEN], sum[MAX_DIGEST_LEN];
FILE *fp;
char *cp;
- int len, i;
time_t mtime;
+ int len, i, flags;
OFF_T file_length;
uint32 ctime, inode;
+ const char *alt_sum = NULL;
int dlen = dirname ? strlcpy(fbuf, dirname, sizeof fbuf) : 0;
if (dlen >= (int)(sizeof fbuf - 1 - RSYNCSUMS_LEN))
@@ -458,7 +554,7 @@ static void read_checksums(int slot, struct file_list *flist, const char *dirnam
while (fgets(line, sizeof line, fp)) {
cp = line;
if (file_sum_nni->num == CSUM_MD5) {
- char *alt_sum = cp;
+ alt_sum = cp;
if (*cp == '=')
while (*++cp == '=') {}
else
@@ -469,7 +565,14 @@ static void read_checksums(int slot, struct file_list *flist, const char *dirnam
}
if (*cp == '=') {
- continue;
+ for (i = 0; i < flist_csum_len*2; i++, cp++) {
+ if (*cp != '=') {
+ cp = "";
+ break;
+ }
+ }
+ memset(sum, 0, flist_csum_len);
+ flags = FLAG_SUM_MISSING;
} else {
for (i = 0; i < flist_csum_len*2; i++, cp++) {
int x;
@@ -487,13 +590,14 @@ static void read_checksums(int slot, struct file_list *flist, const char *dirnam
else
sum[i/2] = x << 4;
}
+ flags = 0;
}
if (*cp != ' ')
break;
while (*++cp == ' ') {}
if (file_sum_nni->num < CSUM_MD5) {
- char *alt_sum = cp;
+ alt_sum = cp;
if (*cp == '=')
while (*++cp == '=') {}
else
@@ -543,24 +647,112 @@ static void read_checksums(int slot, struct file_list *flist, const char *dirnam
continue;
strlcpy(fbuf+dlen, cp, sizeof fbuf - dlen);
+ if (is_excluded(fbuf, 0, ALL_FILTERS)) {
+ flags |= FLAG_SUM_KEEP;
+ csum_cache[slot].checksum_matches++;
+ }
add_checksum(flist, dirname, cp, len, file_length,
mtime, ctime, inode,
- sum);
+ sum, alt_sum, flags);
}
fclose(fp);
flist_sort_and_clean(flist, CLEAN_KEEP_LAST);
}
+void set_cached_checksum(struct file_list *file_flist, struct file_struct *file)
+{
+ int j;
+ FILE *out_fp;
+ STRUCT_STAT st;
+ char fbuf[MAXPATHLEN];
+ const char *fn = f_name(file, NULL);
+ struct file_list *flist = csum_cache[0].flist;
+
+ if (dry_run && !(checksum_files & CSF_AFFECT_DRYRUN))
+ return;
+
+ if (stat(fn, &st) < 0)
+ return;
+
+ checksum_filename(0, file->dirname, fbuf);
+
+ if (file_flist != flist->next) {
+ const char *cp = F_SUM(file);
+ const char *end = cp + flist_csum_len;
+
+ if (!(out_fp = fopen(fbuf, "a")))
+ return;
+
+ if (file_sum_nni->num == CSUM_MD5) {
+ for (j = 0; j < flist_csum_len; j++)
+ fputs("==", out_fp);
+ fputc(' ', out_fp);
+ }
+ do {
+ fprintf(out_fp, "%02x", (int)CVAL(cp, 0));
+ } while (++cp != end);
+ if (file_sum_nni->num < CSUM_MD5) {
+ fputc(' ', out_fp);
+ for (j = 0; j < flist_csum_len; j++)
+ fputs("==", out_fp);
+ }
+ fprintf(out_fp, " %10.0f %10.0f %10lu %10lu %s\n",
+ (double)st.st_size, (double)st.st_mtime,
+ (long)(uint32)st.st_ctime, (long)(uint32)st.st_ino,
+ file->basename);
+
+ fclose(out_fp);
+ return;
+ }
+
+ if ((j = flist_find(flist, file)) >= 0) {
+ struct file_struct *fp = flist->sorted[j];
+ int inc = 0;
+ if (F_LENGTH(fp) != st.st_size) {
+ fp->len32 = (uint32)st.st_size;
+ if (st.st_size > 0xFFFFFFFFu) {
+ OPT_EXTRA(fp, 0)->unum = (uint32)(st.st_size >> 32);
+ fp->flags |= FLAG_LENGTH64;
+ } else
+ fp->flags &= FLAG_LENGTH64;
+ inc = 1;
+ }
+ if (fp->modtime != st.st_mtime) {
+ fp->modtime = st.st_mtime;
+ inc = 1;
+ }
+ if (F_CTIME(fp) != (uint32)st.st_ctime) {
+ F_CTIME(fp) = (uint32)st.st_ctime;
+ inc = 1;
+ }
+ if (F_INODE(fp) != (uint32)st.st_ino) {
+ F_INODE(fp) = (uint32)st.st_ino;
+ inc = 1;
+ }
+ memcpy(F_SUM(fp), F_SUM(file), MAX_DIGEST_LEN);
+ csum_cache[0].checksum_updates += inc;
+ fp->flags &= ~FLAG_SUM_MISSING;
+ fp->flags |= FLAG_SUM_KEEP;
+ return;
+ }
+
+ csum_cache[0].checksum_updates +=
+ add_checksum(flist, file->dirname, file->basename, strlen(file->basename) + 1,
+ st.st_size, (uint32)st.st_mtime, (uint32)st.st_ctime,
+ st.st_ino, F_SUM(file), NULL, FLAG_SUM_KEEP);
+}
+
void get_cached_checksum(int slot, const char *fname, struct file_struct *file,
- STRUCT_STAT *stp, char *sum_buf)
+ int basename_len, STRUCT_STAT *stp, char *sum_buf)
{
struct file_list *flist = csum_cache[slot].flist;
int j;
if (!flist->next) {
flist->next = cur_flist; /* next points from checksum flist to file flist */
+ csum_cache[slot].dirname = file->dirname;
read_checksums(slot, flist, file->dirname);
}
@@ -572,12 +764,31 @@ void get_cached_checksum(int slot, const char *fname, struct file_struct *file,
&& (checksum_files & CSF_LAX
|| (F_CTIME(fp) == (uint32)stp->st_ctime
&& F_INODE(fp) == (uint32)stp->st_ino))) {
- memcpy(sum_buf, F_SUM(fp), MAX_DIGEST_LEN);
+ if (fp->flags & FLAG_SUM_MISSING) {
+ fp->flags &= ~FLAG_SUM_MISSING;
+ csum_cache[slot].checksum_updates++;
+ file_checksum(fname, stp, sum_buf);
+ memcpy(F_SUM(fp), sum_buf, MAX_DIGEST_LEN);
+ } else {
+ csum_cache[slot].checksum_matches++;
+ memcpy(sum_buf, F_SUM(fp), MAX_DIGEST_LEN);
+ }
+ fp->flags |= FLAG_SUM_KEEP;
return;
}
+ clear_file(fp);
}
file_checksum(fname, stp, sum_buf);
+
+ if (checksum_files & CSF_UPDATE) {
+ if (basename_len < 0)
+ basename_len = strlen(file->basename) + 1;
+ csum_cache[slot].checksum_updates +=
+ add_checksum(flist, file->dirname, file->basename, basename_len,
+ stp->st_size, stp->st_mtime, (uint32)stp->st_ctime,
+ (uint32)stp->st_ino, sum_buf, NULL, FLAG_SUM_KEEP);
+ }
}
/* Call this with EITHER (1) "file, NULL, 0" to chdir() to the file's
@@ -1583,6 +1794,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
if (is_excluded(thisname, S_ISDIR(st.st_mode) != 0, filter_level)) {
if (ignore_perishable)
non_perishable_cnt++;
+ if (S_ISREG(st.st_mode))
+ REGULAR_SKIPPED(flist)++;
return NULL;
}
@@ -1629,13 +1842,13 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
lastdir[len] = '\0';
lastdir_len = len;
if (checksum_files && am_sender && flist)
- reset_checksum_cache();
+ reset_checksum_cache(0);
}
} else {
basename = thisname;
if (checksum_files && am_sender && flist && lastdir_len == -2) {
lastdir_len = -1;
- reset_checksum_cache();
+ reset_checksum_cache(0);
}
}
basename_len = strlen(basename) + 1; /* count the '\0' */
@@ -1759,7 +1972,7 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
if (always_checksum && am_sender && S_ISREG(st.st_mode)) {
if (flist && checksum_files)
- get_cached_checksum(0, thisname, file, &st, tmp_sum);
+ get_cached_checksum(0, thisname, file, basename_len, &st, tmp_sum);
else
file_checksum(thisname, &st, tmp_sum);
if (sender_keeps_checksum)
@@ -2151,6 +2364,9 @@ static void send_directory(int f, struct file_list *flist, char *fbuf, int len,
closedir(d);
+ if (checksum_files & CSF_UPDATE && am_sender && f >= 0)
+ reset_checksum_cache(1);
+
if (f >= 0 && recurse && !divert_dirs) {
int i, end = flist->used - 1;
/* send_if_directory() bumps flist->used, so use "end". */
@@ -2816,6 +3032,9 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
rprintf(FINFO, "[%s] flist_eof=1\n", who_am_i());
}
+ if (checksum_files & CSF_UPDATE && flist_eof)
+ reset_checksum_cache(0); /* writes any last updates */
+
return flist;
}
diff --git a/generator.c b/generator.c
--- a/generator.c
+++ b/generator.c
@@ -113,6 +113,7 @@ static int dir_tweaking;
static int symlink_timeset_failed_flags;
static int need_retouch_dir_times;
static int need_retouch_dir_perms;
+static int started_whole_dir, upcoming_whole_dir;
static const char *solo_file = NULL;
/* Forward declarations. */
@@ -627,7 +628,7 @@ int quick_check_ok(enum filetype ftype, const char *fn, struct file_struct *file
if (always_checksum > 0) {
char sum[MAX_DIGEST_LEN];
if (checksum_files && slot >= 0)
- get_cached_checksum(slot, fn, file, st, sum);
+ get_cached_checksum(slot, fn, file, -1, st, sum);
else
file_checksum(fn, st, sum);
return memcmp(sum, F_SUM(file), flist_csum_len) == 0;
@@ -1359,7 +1360,8 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
}
}
if (checksum_files) {
- reset_checksum_cache();
+ reset_checksum_cache(started_whole_dir);
+ started_whole_dir = upcoming_whole_dir;
}
need_new_dirscan = 0;
}
@@ -1547,6 +1549,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
else
change_local_filter_dir(fname, strlen(fname), F_DEPTH(file));
}
+ upcoming_whole_dir = file->flags & FLAG_CONTENT_DIR && f_out != -1 ? 1 : 0;
prior_dir_file = file;
goto cleanup;
}
@@ -1819,6 +1822,8 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
handle_partial_dir(partialptr, PDIR_DELETE);
}
set_file_attrs(fname, file, &sx, NULL, maybe_ATTRS_REPORT | maybe_ATTRS_ACCURATE_TIME);
+ if (checksum_files & CSF_UPDATE)
+ set_cached_checksum(cur_flist, file);
if (itemizing)
itemize(fnamecmp, file, ndx, statret, &sx, 0, 0, NULL);
#ifdef SUPPORT_HARD_LINKS
@@ -2311,6 +2316,7 @@ void generate_files(int f_out, const char *local_name)
} else
change_local_filter_dir(fbuf, strlen(fbuf), F_DEPTH(fp));
}
+ upcoming_whole_dir = fp->flags & FLAG_CONTENT_DIR ? 1 : 0;
}
for (i = cur_flist->low; i <= cur_flist->high; i++) {
struct file_struct *file = cur_flist->sorted[i];
@@ -2405,6 +2411,9 @@ void generate_files(int f_out, const char *local_name)
wait_for_receiver();
}
+ if (checksum_files)
+ reset_checksum_cache(started_whole_dir);
+
info_levels[INFO_FLIST] = save_info_flist;
info_levels[INFO_PROGRESS] = save_info_progress;
diff --git a/io.c b/io.c
--- a/io.c
+++ b/io.c
@@ -55,6 +55,7 @@ extern int read_batch;
extern int compat_flags;
extern int protect_args;
extern int checksum_seed;
+extern int checksum_files;
extern int daemon_connection;
extern int protocol_version;
extern int remove_source_files;
@@ -1117,6 +1118,9 @@ static void got_flist_entry_status(enum festatus status, int ndx)
if (inc_recurse)
flist->in_progress++;
}
+ } else if (checksum_files & CSF_UPDATE) {
+ struct file_struct *file = flist->files[ndx - flist->ndx_start];
+ set_cached_checksum(flist, file);
}
#endif
break;
diff --git a/loadparm.c b/loadparm.c
--- a/loadparm.c
+++ b/loadparm.c
@@ -166,6 +166,10 @@ static struct enum_list enum_checksum_files[] = {
{ CSF_IGNORE_FILES, "none" },
{ CSF_LAX_MODE, "lax" },
{ CSF_STRICT_MODE, "strict" },
+ { CSF_LAX_MODE|CSF_UPDATE, "+lax" },
+ { CSF_STRICT_MODE|CSF_UPDATE, "+strict" },
+ { CSF_LAX_MODE|CSF_UPDATE|CSF_AFFECT_DRYRUN, "++lax" },
+ { CSF_STRICT_MODE|CSF_UPDATE|CSF_AFFECT_DRYRUN, "++strict" },
{ -1, NULL }
};
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
@@ -1755,7 +1755,15 @@ int parse_arguments(int *argc_p, const char ***argv_p)
case OPT_SUMFILES:
arg = poptGetOptArg(pc);
- checksum_files = 0;
+ if (*arg == '+') {
+ arg++;
+ checksum_files = CSF_UPDATE;
+ if (*arg == '+') {
+ arg++;
+ checksum_files |= CSF_AFFECT_DRYRUN;
+ }
+ } else
+ checksum_files = 0;
if (strcmp(arg, "lax") == 0)
checksum_files |= CSF_LAX_MODE;
else if (strcmp(arg, "strict") == 0)
diff --git a/receiver.c b/receiver.c
--- a/receiver.c
+++ b/receiver.c
@@ -51,6 +51,7 @@ extern int sparse_files;
extern int preallocate_files;
extern int keep_partial;
extern int checksum_seed;
+extern int checksum_files;
extern int whole_file;
extern int inplace;
extern int inplace_partial;
@@ -440,7 +441,8 @@ static void handle_delayed_updates(char *local_name)
"rename failed for %s (from %s)",
full_fname(fname), partialptr);
} else {
- if (remove_source_files || (preserve_hard_links && F_IS_HLINKED(file)))
+ if (remove_source_files || checksum_files & CSF_UPDATE
+ || (preserve_hard_links && F_IS_HLINKED(file)))
send_msg_success(fname, ndx);
handle_partial_dir(partialptr, PDIR_DELETE);
}
@@ -926,7 +928,8 @@ int recv_files(int f_in, int f_out, char *local_name)
case 2:
break;
case 1:
- if (remove_source_files || inc_recurse || (preserve_hard_links && F_IS_HLINKED(file)))
+ if (remove_source_files || inc_recurse || checksum_files & CSF_UPDATE
+ || (preserve_hard_links && F_IS_HLINKED(file)))
send_msg_success(fname, ndx);
break;
case 0: {
diff --git a/rsync.1.md b/rsync.1.md
--- a/rsync.1.md
+++ b/rsync.1.md
@@ -839,9 +839,13 @@ expand it.
The MODE value is either "lax", for relaxed checking (which compares size
and mtime), "strict" (which also compares ctime and inode), or "none" to
- ignore any .rsyncsums files ("none" is the default). Rsync does not create
- or update these files, but there is a perl script in the support directory
- named "rsyncsums" that can be used for that.
+ ignore any .rsyncsums files ("none" is the default).
+ If you want rsync to create and/or update these files, specify a prefixed
+ plus ("+lax" or "+strict"). Adding a second prefixed '+' causes the
+ checksum-file updates to happen even when the transfer is in [`--dry-run`](#opt)
+ mode ("++lax" or "++strict"). There is also a perl script in the support
+ directory named "rsyncsums" that can be used to update the .rsyncsums
+ files.
This option has no effect unless [`--checksum`](#opt) (`-c`) was also
specified. It also only affects the current side of the transfer, so if
diff --git a/rsync.h b/rsync.h
--- a/rsync.h
+++ b/rsync.h
@@ -1117,6 +1117,8 @@ typedef struct {
#define CSF_ENABLE (1<<1)
#define CSF_LAX (1<<2)
+#define CSF_UPDATE (1<<3)
+#define CSF_AFFECT_DRYRUN (1<<4)
#define CSF_IGNORE_FILES 0
#define CSF_LAX_MODE (CSF_ENABLE|CSF_LAX)
diff --git a/rsyncd.conf.5.md b/rsyncd.conf.5.md
--- a/rsyncd.conf.5.md
+++ b/rsyncd.conf.5.md
@@ -458,13 +458,15 @@ in the values of parameters. See that section for details.
This parameter tells rsync to make use of any cached checksum information
it finds in per-directory .rsyncsums files when the current transfer is
using the `--checksum` option. The value can be set to either "lax",
- "strict", or "none". See the client's `--sumfiles` option for what these
- choices do.
+ "strict", "+lax", "+strict", "++lax", "++strict", or +"none". See the
+ client's `--sumfiles` option for what these choices do.
Note also that the client's command-line option, `--sumfiles`, has no
effect on a daemon. A daemon will only access checksum files if this
- config option tells it to. See also the `exclude` directive for a way to
- hide the .rsyncsums files from the user.
+ config option tells it to. You can configure updating of the .rsyncsums
+ files even if the module itself is configured to be read-only. See also
+ the `exclude` directive for a way to hide the .rsyncsums files from the
+ user.
0. `read only`