-This adds a sender optimization feature that allows a cache of checksums
-to be used when the client specifies the --checksum option, and creates
-and/or updates the .rsyncsums files when --checksum-updating is
-specified.
+This builds on the sender optimization feature of the checksum-reading
+patch and adds the ability to create and/or updates the .rsyncsums files
+when --checksum-updating (or "checksum updating = true") is specified.
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: when sending individual files (as opposed to an entire directory),
-we should still update the .rsyncsums file if we compute a new checksum.
-(The file is currently only written if we send an entire dir.)
-
---- old/clientserver.c
-+++ new/clientserver.c
-@@ -37,6 +37,7 @@ extern int sanitize_paths;
+diff --git a/clientserver.c b/clientserver.c
+--- a/clientserver.c
++++ b/clientserver.c
+@@ -38,6 +38,7 @@ extern int sanitize_paths;
extern int filesfrom_fd;
extern int remote_protocol;
extern int protocol_version;
+extern int checksum_updating;
extern int io_timeout;
extern int no_detach;
- extern int default_af_hint;
-@@ -634,6 +635,8 @@ static int rsync_module(int f_in, int f_
+ extern int write_batch;
+@@ -712,6 +713,8 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
else if (am_root < 0) /* Treat --fake-super from client as --super. */
am_root = 2;
if (filesfrom_fd == 0)
filesfrom_fd = f_in;
---- old/flist.c
-+++ new/flist.c
-@@ -25,6 +25,7 @@
+diff --git a/flist.c b/flist.c
+--- a/flist.c
++++ b/flist.c
+@@ -26,6 +26,7 @@
#include "io.h"
extern int verbose;
+extern int dry_run;
- extern int list_only;
extern int am_root;
extern int am_server;
-@@ -57,6 +58,7 @@ extern int implied_dirs;
+ extern int am_daemon;
+@@ -58,6 +59,7 @@ extern int implied_dirs;
extern int file_extra_cnt;
extern int ignore_perishable;
extern int non_perishable_cnt;
extern int prune_empty_dirs;
extern int copy_links;
extern int copy_unsafe_links;
-@@ -79,6 +81,9 @@ extern iconv_t ic_send, ic_recv;
+@@ -83,6 +85,9 @@ extern iconv_t ic_send, ic_recv;
#define PTR_SIZE (sizeof (struct file_struct *))
-+#define FLAG_SUM_MISSING (1<<1)
-+#define FLAG_SUM_FOUND (1<<2)
++#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 checksum_len;
dev_t filesystem_dev; /* used to implement -x */
-@@ -101,6 +106,8 @@ static char tmp_sum[MAX_DIGEST_LEN];
+@@ -121,6 +126,9 @@ static char tmp_sum[MAX_DIGEST_LEN];
static char empty_sum[MAX_DIGEST_LEN];
static int flist_count_offset; /* for --delete --progress */
static int dir_count = 0;
-+static struct file_list *checksum_flist = NULL;
+static int checksum_matches = 0;
++static int checksum_updates = 0;
++static int regular_skipped = 0;
+ static struct file_list *checksum_flist = NULL;
- static void clean_flist(struct file_list *flist, int strip_root);
- static void output_flist(struct file_list *flist);
-@@ -317,6 +324,259 @@ static void flist_done_allocating(struct
- flist->pool_boundary = ptr;
- }
+ static void flist_sort_and_clean(struct file_list *flist, int strip_root);
+@@ -316,7 +324,8 @@ static void flist_done_allocating(struct file_list *flist)
-+/* The len count is the length of the basename + 1 for the null. */
-+static void add_checksum(const char *dirname, const char *basename, int len,
-+ OFF_T file_length, time_t mtime, const char *sum,
-+ const char *alt_sum, int flags)
-+{
-+ struct file_struct *file;
-+ int alloc_len, extra_len;
-+ char *bp;
-+
-+ if (len == 10+1 && *basename == '.' && strcmp(basename, ".rsyncsums") == 0)
-+ return;
-+
-+ if (len < 0)
-+ len = strlen(basename) + 1;
-+
-+ extra_len = (file_extra_cnt + (file_length > 0xFFFFFFFFu) + SUM_EXTRA_CNT)
-+ * EXTRA_LEN;
-+#if EXTRA_ROUNDING > 0
-+ if (extra_len & (EXTRA_ROUNDING * EXTRA_LEN))
-+ extra_len = (extra_len | (EXTRA_ROUNDING * EXTRA_LEN)) + EXTRA_LEN;
-+#endif
+ /* The len count is the length of the basename + 1 for the null. */
+ static int add_checksum(const char *dirname, const char *basename, int len,
+- OFF_T file_length, time_t mtime, const char *sum)
++ OFF_T file_length, time_t mtime, int32 ctime, int32 inode,
++ const char *sum, const char *alt_sum, int flags)
+ {
+ struct file_struct *file;
+ int alloc_len, extra_len;
+@@ -327,13 +336,14 @@ static int add_checksum(const char *dirname, const char *basename, int len,
+ if (file_length == 0)
+ return 0;
+
+- extra_len = (file_extra_cnt + (file_length > 0xFFFFFFFFu) + SUM_EXTRA_CNT)
++ /* "2" is for a 32-bit ctime num and an 32-bit inode num. */
++ extra_len = (file_extra_cnt + (file_length > 0xFFFFFFFFu) + SUM_EXTRA_CNT + 2)
+ * EXTRA_LEN;
+ #if EXTRA_ROUNDING > 0
+ 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 + len;
+ alloc_len = FILE_STRUCT_LEN + extra_len + len + checksum_len*2 + 1;
-+ bp = pool_alloc(checksum_flist->file_pool, alloc_len, "add_checksum");
-+
-+ memset(bp, 0, extra_len + FILE_STRUCT_LEN);
-+ bp += extra_len;
-+ file = (struct file_struct *)bp;
-+ bp += FILE_STRUCT_LEN;
-+
-+ memcpy(bp, basename, len);
+ bp = pool_alloc(checksum_flist->file_pool, alloc_len, "add_checksum");
+
+ memset(bp, 0, extra_len + FILE_STRUCT_LEN);
+@@ -342,7 +352,14 @@ static int add_checksum(const char *dirname, const char *basename, int len,
+ bp += FILE_STRUCT_LEN;
+
+ memcpy(bp, basename, len);
+ if (alt_sum)
+ strlcpy(bp+len, alt_sum, checksum_len*2 + 1);
+ else {
+ memset(bp+len, '=', checksum_len*2);
+ bp[len+checksum_len*2] = '\0';
+ }
-+
+
+ file->flags = flags;
-+ file->mode = S_IFREG;
-+ file->modtime = mtime;
-+ file->len32 = (uint32)file_length;
-+ if (file_length > 0xFFFFFFFFu) {
-+ file->flags |= FLAG_LENGTH64;
-+ OPT_EXTRA(file, 0)->unum = (uint32)(file_length >> 32);
-+ }
-+ file->dirname = dirname;
-+ bp = (char*)F_SUM(file);
-+ memcpy(bp, sum, checksum_len);
-+
-+ flist_expand(checksum_flist, 1);
-+ checksum_flist->files[checksum_flist->count++] = file;
-+
-+ checksum_flist->sorted = checksum_flist->files;
-+}
-+
-+/* The direname value must remain unchanged during the lifespan of the
-+ * created checksum_flist object because we use it directly. */
-+static void read_checksums(const char *dirname)
+ file->mode = S_IFREG;
+ file->modtime = mtime;
+ file->len32 = (uint32)file_length;
+@@ -353,6 +370,8 @@ static int add_checksum(const char *dirname, const char *basename, int len,
+ file->dirname = dirname;
+ bp = F_SUM(file);
+ memcpy(bp, sum, checksum_len);
++ F_CTIME(file) = ctime;
++ F_INODE(file) = inode;
+
+ flist_expand(checksum_flist, 1);
+ checksum_flist->files[checksum_flist->used++] = file;
+@@ -362,17 +381,104 @@ static int add_checksum(const char *dirname, const char *basename, int len,
+ return 1;
+ }
+
++static void write_checksums(const char *next_dirname, int whole_dir)
+{
-+ char line[MAXPATHLEN+1024], fbuf[MAXPATHLEN], sum[MAX_DIGEST_LEN];
-+ const char *alt_sum = NULL;
-+ OFF_T file_length;
-+ time_t mtime;
-+ int len, dlen, i, flags;
-+ char *cp;
-+ FILE *fp;
-+
-+ if (checksum_flist) {
-+ /* Reset the pool memory and empty the file-list array. */
-+ pool_free_old(checksum_flist->file_pool,
-+ pool_boundary(checksum_flist->file_pool, 0));
-+ checksum_flist->count = 0;
-+ } else
-+ checksum_flist = flist_new(FLIST_TEMP, "read_checksums");
++ static const char *dirname_save;
++ char fbuf[MAXPATHLEN];
++ const char *dirname;
++ int used, new_entries, counts_match, no_skipped;
++ FILE *out_fp;
++ int i;
+
-+ checksum_flist->low = 0;
-+ checksum_flist->high = -1;
-+ checksum_matches = 0;
++ dirname = dirname_save;
++ dirname_save = next_dirname;
+
-+ if (dirname) {
-+ dlen = strlcpy(fbuf, dirname, sizeof fbuf);
-+ if (dlen >= (int)sizeof fbuf)
-+ return;
-+ fbuf[dlen++] = '/';
-+ } else
-+ dlen = 0;
-+ strlcpy(fbuf+dlen, ".rsyncsums", sizeof fbuf - dlen);
-+ if (!(fp = fopen(fbuf, "r")))
++ if (!dirname)
+ return;
+
-+ while (fgets(line, sizeof line, fp)) {
-+ cp = line;
-+ if (protocol_version >= 30) {
-+ alt_sum = cp;
-+ if (*cp == '=')
-+ while (*++cp == '=') {}
-+ else
-+ while (isXDigit(cp)) cp++;
-+ if (cp - alt_sum != MD4_DIGEST_LEN*2 || *cp != ' ')
-+ break;
-+ while (*++cp == ' ') {}
-+ }
-+
-+ if (*cp == '=') {
-+ for (i = 0; i < checksum_len*2; i++, cp++) {
-+ if (*cp != '=') {
-+ cp = "";
-+ break;
-+ }
-+ }
-+ memset(sum, 0, checksum_len);
-+ flags = FLAG_SUM_MISSING;
-+ } else {
-+ for (i = 0; i < checksum_len*2; i++, cp++) {
-+ int x;
-+ if (isXDigit(cp)) {
-+ if (isDigit(cp))
-+ x = *cp - '0';
-+ else
-+ x = (*cp & 0xF) + 9;
-+ } else {
-+ cp = "";
-+ break;
-+ }
-+ if (i & 1)
-+ sum[i/2] |= x;
-+ else
-+ sum[i/2] = x << 4;
-+ }
-+ flags = 0;
-+ }
-+ if (*cp != ' ')
-+ break;
-+ while (*++cp == ' ') {}
-+
-+ if (protocol_version < 30) {
-+ alt_sum = cp;
-+ if (*cp == '=')
-+ while (*++cp == '=') {}
-+ else
-+ while (isXDigit(cp)) cp++;
-+ if (cp - alt_sum != MD5_DIGEST_LEN*2 || *cp != ' ')
-+ break;
-+ while (*++cp == ' ') {}
-+ }
-+
-+ file_length = 0;
-+ while (isDigit(cp))
-+ file_length = file_length * 10 + *cp++ - '0';
-+ if (*cp != ' ')
-+ break;
-+ while (*++cp == ' ') {}
-+
-+ mtime = 0;
-+ while (isDigit(cp))
-+ mtime = mtime * 10 + *cp++ - '0';
-+ if (*cp != ' ')
-+ break;
-+ while (*++cp == ' ') {}
-+
-+ len = strlen(cp);
-+ while (len && (cp[len-1] == '\n' || cp[len-1] == '\r'))
-+ len--;
-+ if (!len)
-+ break;
-+ cp[len++] = '\0'; /* len now counts the null */
-+ if (strchr(cp, '/') || len > MAXPATHLEN)
-+ break;
-+
-+ strlcpy(fbuf+dlen, cp, sizeof fbuf - dlen);
-+ if (is_excluded(fbuf, 0, ALL_FILTERS)) {
-+ flags |= FLAG_SUM_FOUND;
-+ checksum_matches++;
-+ }
-+
-+ add_checksum(dirname, cp, len, file_length, mtime,
-+ sum, alt_sum, flags);
-+ }
-+ fclose(fp);
++ used = checksum_flist->used;
++ new_entries = checksum_updates != 0;
++ counts_match = used == checksum_matches;
++ no_skipped = whole_dir && regular_skipped == 0;
+
+ clean_flist(checksum_flist, 0);
-+}
-+
-+static void write_checksums(const char *dirname)
-+{
-+ char buf[MAXPATHLEN+1024];
-+ int count = checksum_flist->count;
-+ int new_entries = count > checksum_flist->high + 1;
-+ int orphan_entires = count != checksum_matches;
-+ FILE *out_fp;
-+ int i;
+
-+
-+ for (i = checksum_flist->high + 1; i < count; i++) {
-+ struct file_struct *file = checksum_flist->sorted[i];
-+ file->flags |= FLAG_SUM_FOUND;
-+ }
-+
-+ clean_flist(checksum_flist, 0);
-+ checksum_flist->count = 0;
++ checksum_flist->used = 0;
+ checksum_matches = 0;
++ checksum_updates = 0;
++ regular_skipped = 0;
+
+ if (dry_run)
+ return;
+
-+ if (dirname) {
-+ if (pathjoin(buf, sizeof buf, dirname, ".rsyncsums") >= sizeof buf)
++ if (*dirname) {
++ if (pathjoin(fbuf, sizeof fbuf, dirname, ".rsyncsums") >= sizeof fbuf)
+ return;
+ } else
-+ strlcpy(buf, ".rsyncsums", sizeof buf);
++ strlcpy(fbuf, ".rsyncsums", sizeof fbuf);
+
-+ if (checksum_flist->high - checksum_flist->low < 0) {
-+ unlink(buf);
++ if (checksum_flist->high - checksum_flist->low < 0 && no_skipped) {
++ unlink(fbuf);
+ return;
+ }
+
-+ if (!new_entries && !orphan_entires)
++ if (!new_entries && (counts_match || !whole_dir))
+ return;
+
-+ if (!(out_fp = fopen(buf, "w")))
++ if (!(out_fp = fopen(fbuf, "w")))
+ return;
+
++ new_entries = 0;
+ for (i = checksum_flist->low; i <= checksum_flist->high; i++) {
+ struct file_struct *file = checksum_flist->sorted[i];
+ const char *cp = F_SUM(file);
+ const char *end = cp + checksum_len;
-+ if (!(file->flags & FLAG_SUM_FOUND))
++ const char *alt_sum = file->basename + strlen(file->basename) + 1;
++ int32 ctime, inode;
++ if (whole_dir && !(file->flags & FLAG_SUM_KEEP))
+ continue;
-+ if (protocol_version >= 30) {
-+ fprintf(out_fp, "%s ",
-+ file->basename + strlen(file->basename) + 1);
-+ }
++ ctime = F_CTIME(file);
++ inode = F_INODE(file);
++ if (protocol_version >= 30)
++ fprintf(out_fp, "%s ", alt_sum);
+ if (file->flags & FLAG_SUM_MISSING) {
++ new_entries++;
+ do {
+ fprintf(out_fp, "==");
+ } while (++cp != end);
+ } else {
+ do {
-+ fprintf(out_fp, "%02x", CVAL(cp, 0));
++ fprintf(out_fp, "%02x", (int)CVAL(cp, 0));
+ } while (++cp != end);
+ }
-+ if (protocol_version < 30) {
-+ fprintf(out_fp, " %s",
-+ file->basename + strlen(file->basename) + 1);
-+ }
-+ fprintf(out_fp, " %10.0f %10ld %s\n",
-+ (double)F_LENGTH(file), (long)file->modtime,
-+ file->basename);
++ if (protocol_version < 30)
++ fprintf(out_fp, " %s", alt_sum);
++ if (*alt_sum == '=')
++ new_entries++;
++ fprintf(out_fp, " %10.0f %10.0f %10lu %10lu %s\n",
++ (double)F_LENGTH(file), (double)file->modtime,
++ (long)ctime, (long)inode, file->basename);
+ }
+
+ fclose(out_fp);
+}
+
- int push_pathname(const char *dir, int len)
+ /* The direname value must remain unchanged during the lifespan of the
+ * created checksum_flist object because we use it directly. */
+ static void read_checksums(const char *dirname)
{
- if (dir == pathname)
-@@ -973,34 +1233,24 @@ static struct file_struct *recv_file_ent
- return file;
- }
+ char line[MAXPATHLEN+1024], fbuf[MAXPATHLEN], sum[MAX_DIGEST_LEN];
++ const char *alt_sum = NULL;
+ OFF_T file_length;
+ time_t mtime;
+- int len, dlen, i;
++ int32 ctime, inode;
++ int len, dlen, i, flags;
+ char *cp;
+ FILE *fp;
--/**
-- * Create a file_struct for a named file by reading its stat()
-- * information and performing extensive checks against global
-- * options.
-- *
-- * @return the new file, or NULL if there was an error or this file
-- * should be excluded.
-+/* Create a file_struct for a named file by reading its stat() information
-+ * and performing extensive checks against global options.
- *
-- * @todo There is a small optimization opportunity here to avoid
-- * stat()ing the file in some circumstances, which has a certain cost.
-- * We are called immediately after doing readdir(), and so we may
-- * already know the d_type of the file. We could for example avoid
-- * statting directories if we're not recursing, but this is not a very
-- * important case. Some systems may not have d_type.
-- **/
-+ * Returns a pointer to the new file struct, or NULL if there was an error
-+ * or this file should be excluded. */
- struct file_struct *make_file(const char *fname, struct file_list *flist,
- STRUCT_STAT *stp, int flags, int filter_level)
- {
- static char *lastdir;
-- static int lastdir_len = -1;
-+ static int lastdir_len = -2;
- struct file_struct *file;
-- STRUCT_STAT st;
- char thisname[MAXPATHLEN];
- char linkname[MAXPATHLEN];
- int alloc_len, basename_len, linkname_len;
- int extra_len = file_extra_cnt * EXTRA_LEN;
- const char *basename;
- alloc_pool_t *pool;
-+ STRUCT_STAT st;
- char *bp;
-
- if (strlcpy(thisname, fname, sizeof thisname)
-@@ -1115,9 +1365,16 @@ struct file_struct *make_file(const char
- memcpy(lastdir, thisname, len);
- lastdir[len] = '\0';
- lastdir_len = len;
-+ if (always_checksum && am_sender && flist)
-+ read_checksums(lastdir);
++ if (checksum_updating)
++ write_checksums(dirname, 0);
++
+ if (checksum_flist) {
+ /* Reset the pool memory and empty the file-list array. */
+ pool_free_old(checksum_flist->file_pool,
+@@ -383,6 +489,9 @@ static void read_checksums(const char *dirname)
+
+ checksum_flist->low = 0;
+ checksum_flist->high = -1;
++ checksum_matches = 0;
++ checksum_updates = 0;
++ regular_skipped = 0;
+
+ if (!dirname)
+ return;
+@@ -401,7 +510,7 @@ static void read_checksums(const char *dirname)
+ while (fgets(line, sizeof line, fp)) {
+ cp = line;
+ if (protocol_version >= 30) {
+- char *alt_sum = cp;
++ alt_sum = cp;
+ if (*cp == '=')
+ while (*++cp == '=') {}
+ else
+@@ -412,7 +521,14 @@ static void read_checksums(const char *dirname)
}
-- } else
-+ } else {
- basename = thisname;
-+ if (always_checksum && am_sender && flist && lastdir_len == -2) {
-+ lastdir_len = -1;
-+ read_checksums(NULL);
+
+ if (*cp == '=') {
+- continue;
++ for (i = 0; i < checksum_len*2; i++, cp++) {
++ if (*cp != '=') {
++ cp = "";
++ break;
++ }
++ }
++ memset(sum, 0, checksum_len);
++ flags = FLAG_SUM_MISSING;
+ } else {
+ for (i = 0; i < checksum_len*2; i++, cp++) {
+ int x;
+@@ -430,13 +546,14 @@ static void read_checksums(const char *dirname)
+ else
+ sum[i/2] = x << 4;
+ }
++ flags = 0;
+ }
+ if (*cp != ' ')
+ break;
+ while (*++cp == ' ') {}
+
+ if (protocol_version < 30) {
+- char *alt_sum = cp;
++ alt_sum = cp;
+ if (*cp == '=')
+ while (*++cp == '=') {}
+ else
+@@ -460,16 +577,16 @@ static void read_checksums(const char *dirname)
+ break;
+ while (*++cp == ' ') {}
+
+- /* Ignore ctime. */
++ ctime = 0;
+ while (isDigit(cp))
+- cp++;
++ ctime = ctime * 10 + *cp++ - '0';
+ if (*cp != ' ')
+ break;
+ while (*++cp == ' ') {}
+
+- /* Ignore inode. */
++ inode = 0;
+ while (isDigit(cp))
+- cp++;
++ inode = inode * 10 + *cp++ - '0';
+ if (*cp != ' ')
+ break;
+ while (*++cp == ' ') {}
+@@ -486,8 +603,13 @@ static void read_checksums(const char *dirname)
+ continue;
+
+ strlcpy(fbuf+dlen, cp, sizeof fbuf - dlen);
++ if (is_excluded(fbuf, 0, ALL_FILTERS)) {
++ flags |= FLAG_SUM_KEEP;
++ checksum_matches++;
+ }
-+ }
- basename_len = strlen(basename) + 1; /* count the '\0' */
- #ifdef SUPPORT_LINKS
-@@ -1193,11 +1450,36 @@ struct file_struct *make_file(const char
+- add_checksum(dirname, cp, len, file_length, mtime, sum);
++ add_checksum(dirname, cp, len, file_length, mtime, ctime, inode,
++ sum, alt_sum, flags);
}
- #endif
+ fclose(fp);
-- if (always_checksum && am_sender && S_ISREG(st.st_mode))
-- file_checksum(thisname, tmp_sum, st.st_size);
--
- F_PATHNAME(file) = pathname;
+@@ -1278,6 +1400,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++;
+ return NULL;
+ }
-+ if (always_checksum && am_sender && S_ISREG(st.st_mode)) {
-+ int j;
-+ if (flist && (j = flist_find(checksum_flist, file)) >= 0) {
-+ struct file_struct *fp = checksum_flist->sorted[j];
-+ if (fp->modtime == st.st_mtime && F_LENGTH(fp) == st.st_size) {
+@@ -1408,13 +1532,36 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
+ int j;
+ if (flist && (j = flist_find(checksum_flist, file)) >= 0) {
+ struct file_struct *fp = checksum_flist->sorted[j];
++ int32 ctime = F_CTIME(fp);
++ int32 inode = F_INODE(fp);
+ if (F_LENGTH(fp) == st.st_size
+- && fp->modtime == st.st_mtime)
+- memcpy(tmp_sum, F_SUM(fp), MAX_DIGEST_LEN);
+- else
+- file_checksum(thisname, tmp_sum, st.st_size);
+- } else
++ && fp->modtime == st.st_mtime
++ && ctime == (int32)st.st_ctime
++ && inode == (int32)st.st_ino) {
+ if (fp->flags & FLAG_SUM_MISSING) {
+ fp->flags &= ~FLAG_SUM_MISSING;
++ checksum_updates++;
+ file_checksum(thisname, tmp_sum, st.st_size);
-+ memcpy((char*)F_SUM(fp), tmp_sum, MAX_DIGEST_LEN);
++ memcpy(F_SUM(fp), tmp_sum, MAX_DIGEST_LEN);
+ } else {
+ checksum_matches++;
+ memcpy(tmp_sum, F_SUM(fp), MAX_DIGEST_LEN);
+ }
-+ fp->flags |= FLAG_SUM_FOUND;
++ fp->flags |= FLAG_SUM_KEEP;
+ } else {
+ clear_file(fp);
-+ goto compute_checksum;
++ goto compute_new_checksum;
+ }
+ } else {
-+ compute_checksum:
-+ file_checksum(thisname, tmp_sum, st.st_size);
++ compute_new_checksum:
+ file_checksum(thisname, tmp_sum, st.st_size);
+ if (checksum_updating && flist) {
-+ add_checksum(file->dirname, basename, basename_len,
-+ st.st_size, st.st_mtime, tmp_sum, NULL, 0);
++ checksum_updates +=
++ add_checksum(file->dirname, basename, basename_len,
++ st.st_size, st.st_mtime, st.st_ctime,
++ st.st_ino, tmp_sum, NULL, FLAG_SUM_KEEP);
+ }
+ }
-+ }
-+
- /* This code is only used by the receiver when it is building
- * a list of files for a delete pass. */
- if (keep_dirlinks && linkname_len && flist) {
-@@ -1241,14 +1523,14 @@ void unmake_file(struct file_struct *fil
-
- static struct file_struct *send_file_name(int f, struct file_list *flist,
- char *fname, STRUCT_STAT *stp,
-- int flags, int filter_flags)
-+ int flags, int filter_level)
- {
- struct file_struct *file;
- #if defined SUPPORT_ACLS || defined SUPPORT_XATTRS
- statx sx;
- #endif
-
-- file = make_file(fname, flist, stp, flags, filter_flags);
-+ file = make_file(fname, flist, stp, flags, filter_level);
- if (!file)
- return NULL;
-
-@@ -1442,7 +1724,7 @@ static void send_directory(int f, struct
- DIR *d;
- int divert_dirs = (flags & FLAG_DIVERT_DIRS) != 0;
- int start = flist->count;
-- int filter_flags = f == -2 ? SERVER_FILTERS : ALL_FILTERS;
-+ int filter_level = f == -2 ? SERVER_FILTERS : ALL_FILTERS;
-
- assert(flist != NULL);
-
-@@ -1471,7 +1753,7 @@ static void send_directory(int f, struct
- continue;
- }
-
-- send_file_name(f, flist, fbuf, NULL, flags, filter_flags);
-+ send_file_name(f, flist, fbuf, NULL, flags, filter_level);
}
- fbuf[len] = '\0';
-@@ -1483,6 +1765,9 @@ static void send_directory(int f, struct
+ /* This code is only used by the receiver when it is building
+@@ -1709,6 +1856,9 @@ static void send_directory(int f, struct file_list *flist, char *fbuf, int len,
closedir(d);
+ if (checksum_updating && always_checksum && am_sender && f >= 0)
-+ write_checksums(fbuf);
++ write_checksums(NULL, 1);
+
if (f >= 0 && recurse && !divert_dirs) {
- int i, end = flist->count - 1;
- /* send_if_directory() bumps flist->count, so use "end". */
-@@ -2206,7 +2491,7 @@ void flist_free(struct file_list *flist)
-
- if (!flist->prev || !flist_cnt)
- pool_destroy(flist->file_pool);
-- else
-+ else if (flist->pool_boundary)
- pool_free_old(flist->file_pool, flist->pool_boundary);
-
- if (flist->sorted && flist->sorted != flist->files)
-@@ -2225,6 +2510,7 @@ static void clean_flist(struct file_list
- if (!flist)
- return;
- if (flist->count == 0) {
-+ flist->low = 0;
- flist->high = -1;
- return;
- }
---- old/loadparm.c
-+++ new/loadparm.c
-@@ -149,6 +149,7 @@ typedef struct
+ int i, end = flist->used - 1;
+ /* send_if_directory() bumps flist->used, so use "end". */
+@@ -2276,7 +2426,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
+ flist_eof = 1;
+
+ if (checksum_updating && always_checksum && flist_eof)
+- read_checksums(NULL);
++ read_checksums(NULL); /* writes any last updates */
+
+ return flist;
+ }
+diff --git a/loadparm.c b/loadparm.c
+--- a/loadparm.c
++++ b/loadparm.c
+@@ -153,6 +153,7 @@ typedef struct
int syslog_facility;
int timeout;
BOOL fake_super;
BOOL ignore_errors;
BOOL ignore_nonreadable;
-@@ -197,6 +198,7 @@ static service sDefault =
+@@ -202,6 +203,7 @@ static service sDefault =
/* syslog_facility; */ LOG_DAEMON,
/* timeout; */ 0,
/* fake_super; */ False,
/* ignore_errors; */ False,
/* ignore_nonreadable; */ False,
-@@ -313,6 +315,7 @@ static struct parm_struct parm_table[] =
- {"lock file", P_STRING, P_LOCAL, &sDefault.lock_file, NULL,0},
- {"log file", P_STRING, P_LOCAL, &sDefault.log_file, NULL,0},
- {"log format", P_STRING, P_LOCAL, &sDefault.log_format, NULL,0},
+@@ -301,6 +303,7 @@ static struct parm_struct parm_table[] =
+ {"socket options", P_STRING, P_GLOBAL,&Globals.socket_options, NULL,0},
+
+ {"auth users", P_STRING, P_LOCAL, &sDefault.auth_users, NULL,0},
+ {"checksum updating", P_BOOL, P_LOCAL, &sDefault.checksum_updating, NULL,0},
- {"max connections", P_INTEGER,P_LOCAL, &sDefault.max_connections, NULL,0},
- {"max verbosity", P_INTEGER,P_LOCAL, &sDefault.max_verbosity, NULL,0},
- {"name", P_STRING, P_LOCAL, &sDefault.name, NULL,0},
-@@ -418,6 +421,7 @@ FN_LOCAL_BOOL(lp_fake_super, fake_super)
+ {"comment", P_STRING, P_LOCAL, &sDefault.comment, NULL,0},
+ {"dont compress", P_STRING, P_LOCAL, &sDefault.dont_compress, NULL,0},
+ {"exclude from", P_STRING, P_LOCAL, &sDefault.exclude_from, NULL,0},
+@@ -421,6 +424,7 @@ FN_LOCAL_INTEGER(lp_max_connections, max_connections)
+ FN_LOCAL_INTEGER(lp_max_verbosity, max_verbosity)
+ FN_LOCAL_INTEGER(lp_timeout, timeout)
+
++FN_LOCAL_BOOL(lp_checksum_updating, checksum_updating)
+ FN_LOCAL_BOOL(lp_fake_super, fake_super)
FN_LOCAL_BOOL(lp_ignore_errors, ignore_errors)
FN_LOCAL_BOOL(lp_ignore_nonreadable, ignore_nonreadable)
- FN_LOCAL_BOOL(lp_list, list)
-+FN_LOCAL_BOOL(lp_checksum_updating, checksum_updating)
- FN_LOCAL_BOOL(lp_read_only, read_only)
- FN_LOCAL_BOOL(lp_strict_modes, strict_modes)
- FN_LOCAL_BOOL(lp_transfer_logging, transfer_logging)
---- old/options.c
-+++ new/options.c
-@@ -109,6 +109,7 @@ size_t bwlimit_writemax = 0;
+diff --git a/options.c b/options.c
+--- a/options.c
++++ b/options.c
+@@ -112,6 +112,7 @@ size_t bwlimit_writemax = 0;
int ignore_existing = 0;
int ignore_non_existing = 0;
int need_messages_from_generator = 0;
+int checksum_updating = 0;
- int max_delete = -1;
+ int max_delete = INT_MIN;
OFF_T max_size = 0;
OFF_T min_size = 0;
-@@ -302,6 +303,7 @@ void usage(enum logcode F)
+@@ -312,6 +313,7 @@ void usage(enum logcode F)
rprintf(F," -q, --quiet suppress non-error messages\n");
rprintf(F," --no-motd suppress daemon-mode MOTD (see manpage caveat)\n");
rprintf(F," -c, --checksum skip based on checksum, not mod-time & size\n");
rprintf(F," -a, --archive archive mode; equals -rlptgoD (no -H,-A,-X)\n");
rprintf(F," --no-OPTION turn off an implied OPTION (e.g. --no-D)\n");
rprintf(F," -r, --recursive recurse into directories\n");
-@@ -542,6 +544,7 @@ static struct poptOption long_options[]
+@@ -560,6 +562,7 @@ static struct poptOption long_options[] = {
{"checksum", 'c', POPT_ARG_VAL, &always_checksum, 1, 0, 0 },
{"no-checksum", 0, POPT_ARG_VAL, &always_checksum, 0, 0, 0 },
{"no-c", 0, POPT_ARG_VAL, &always_checksum, 0, 0, 0 },
{"block-size", 'B', POPT_ARG_LONG, &block_size, 0, 0, 0 },
{"compare-dest", 0, POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
{"copy-dest", 0, POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
-@@ -1896,7 +1899,9 @@ void server_options(char **args,int *arg
+@@ -1966,7 +1969,9 @@ void server_options(char **args, int *argc_p)
args[ac++] = basis_dir[i];
}
}
+ args[ac++] = "--checksum-updating";
+
- if (append_mode)
- args[ac++] = "--append";
---- old/rsync.h
-+++ new/rsync.h
-@@ -1070,6 +1070,12 @@ isDigit(const char *ptr)
- }
+ if (append_mode) {
+ if (append_mode > 1)
+diff --git a/rsync.h b/rsync.h
+--- a/rsync.h
++++ b/rsync.h
+@@ -679,6 +679,10 @@ extern int xattrs_ndx;
+ #define F_SUM(f) ((char*)OPT_EXTRA(f, LEN64_BUMP(f) + HLINK_BUMP(f) \
+ + SUM_EXTRA_CNT - 1))
- static inline int
-+isXDigit(const char *ptr)
-+{
-+ return isxdigit(*(unsigned char *)ptr);
-+}
-+
-+static inline int
- isPrint(const char *ptr)
- {
- return isprint(*(unsigned char *)ptr);
---- old/rsync.yo
-+++ new/rsync.yo
-@@ -307,6 +307,7 @@ to the detailed description below for a
++/* These are only valid on an entry read from a checksum file. */
++#define F_CTIME(f) OPT_EXTRA(f, LEN64_BUMP(f) + SUM_EXTRA_CNT)->num
++#define F_INODE(f) OPT_EXTRA(f, LEN64_BUMP(f) + SUM_EXTRA_CNT + 1)->num
++
+ /* Some utility defines: */
+ #define F_IS_ACTIVE(f) (f)->basename[0]
+ #define F_IS_HLINKED(f) ((f)->flags & FLAG_HLINKED)
+diff --git a/rsync.yo b/rsync.yo
+--- a/rsync.yo
++++ b/rsync.yo
+@@ -317,6 +317,7 @@ to the detailed description below for a complete description. verb(
-q, --quiet suppress non-error messages
--no-motd suppress daemon-mode MOTD (see caveat)
-c, --checksum skip based on checksum, not mod-time & size
-a, --archive archive mode; equals -rlptgoD (no -H,-A,-X)
--no-OPTION turn off an implied OPTION (e.g. --no-D)
-r, --recursive recurse into directories
-@@ -502,9 +503,9 @@ uses a "quick check" that (by default) c
+@@ -516,9 +517,9 @@ uses a "quick check" that (by default) checks if each file's size and time
of last modification match between the sender and receiver. This option
changes this to compare a 128-bit MD4 checksum for each file that has a
matching size. Generating the checksums means that both sides will expend
The sending side generates its checksums while it is doing the file-system
scan that builds the list of the available files. The receiver generates
-@@ -512,12 +513,42 @@ its checksums when it is scanning for ch
+@@ -526,12 +527,42 @@ its checksums when it is scanning for changed files, and will checksum any
file that has the same size as the corresponding sender's file: files with
either a changed size or a changed checksum are selected for transfer.
dit(bf(-a, --archive)) This is equivalent to bf(-rlptgoD). It is a quick
way of saying you want recursion and want to preserve almost
everything (with -H being a notable omission).
---- old/rsyncd.conf.yo
-+++ new/rsyncd.conf.yo
-@@ -198,6 +198,20 @@ locking on this file to ensure that the
+diff --git a/rsyncd.conf.yo b/rsyncd.conf.yo
+--- a/rsyncd.conf.yo
++++ b/rsyncd.conf.yo
+@@ -241,6 +241,20 @@ locking on this file to ensure that the max connections limit is not
exceeded for the modules sharing the lock file.
The default is tt(/var/run/rsyncd.lock).
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff