./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;
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_
+@@ -641,6 +642,8 @@ static int rsync_module(int f_in, int f_
else if (am_root < 0) /* Treat --fake-super from client as --super. */
am_root = 2;
#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];
+@@ -101,6 +106,10 @@ 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 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
+@@ -317,6 +326,304 @@ static void flist_done_allocating(struct
flist->pool_boundary = ptr;
}
+/* 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)
++ OFF_T file_length, time_t mtime, time_t ctime,
++ const char *sum, const char *alt_sum, int flags)
+{
+ struct file_struct *file;
+ int alloc_len, extra_len;
+ if (len < 0)
+ len = strlen(basename) + 1;
+
-+ extra_len = (file_extra_cnt + (file_length > 0xFFFFFFFFu) + SUM_EXTRA_CNT)
-+ * EXTRA_LEN;
++ extra_len = (file_extra_cnt + (file_length > 0xFFFFFFFFu)
++ + SUM_EXTRA_CNT + TIME_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;
+ OPT_EXTRA(file, 0)->unum = (uint32)(file_length >> 32);
+ }
+ file->dirname = dirname;
-+ bp = (char*)F_SUM(file);
++ bp = F_SUM(file);
+ memcpy(bp, sum, checksum_len);
++#if SIZEOF_TIME_T == 4
++ OPT_EXTRA(file, LEN64_BUMP(file) + SUM_EXTRA_CNT)->num = ctime;
++#else
++ memcpy(bp - SIZEOF_TIME_T, &ctime, SIZEOF_TIME_T);
++#endif
+
+ flist_expand(checksum_flist, 1);
+ checksum_flist->files[checksum_flist->count++] = file;
+ checksum_flist->sorted = checksum_flist->files;
+}
+
++static void write_checksums(const char *next_dirname, int whole_dir)
++{
++ static const char *dirname_save;
++ char fbuf[MAXPATHLEN];
++ const char *dirname;
++ int count, new_entries, counts_match, no_skipped;
++ time_t latest_time = 0;
++ FILE *out_fp;
++ int i;
++
++ dirname = dirname_save;
++ dirname_save = next_dirname;
++
++ if (!dirname)
++ return;
++
++ count = checksum_flist->count;
++ new_entries = checksum_updates != 0;
++ counts_match = count == checksum_matches;
++ no_skipped = whole_dir && regular_skipped == 0;
++
++ clean_flist(checksum_flist, 0);
++
++ checksum_flist->count = 0;
++ checksum_matches = 0;
++ checksum_updates = 0;
++ regular_skipped = 0;
++
++ if (dry_run)
++ return;
++
++ if (*dirname) {
++ if (pathjoin(fbuf, sizeof fbuf, dirname, ".rsyncsums") >= sizeof fbuf)
++ return;
++ } else
++ strlcpy(fbuf, ".rsyncsums", sizeof fbuf);
++
++ if (checksum_flist->high - checksum_flist->low < 0 && no_skipped) {
++ unlink(fbuf);
++ return;
++ }
++
++ if (!new_entries && (counts_match || !whole_dir))
++ return;
++
++ 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;
++ const char *alt_sum = file->basename + strlen(file->basename) + 1;
++ time_t ctime;
++ if (whole_dir && !(file->flags & FLAG_SUM_KEEP))
++ continue;
++#if SIZEOF_TIME_T == 4
++ ctime = OPT_EXTRA(file, LEN64_BUMP(file) + SUM_EXTRA_CNT)->num;
++#else
++ memcpy(&ctime, cp - SIZEOF_TIME_T, SIZEOF_TIME_T);
++#endif
++ 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));
++ } while (++cp != end);
++ }
++ if (protocol_version < 30)
++ fprintf(out_fp, " %s", alt_sum);
++ if (*alt_sum == '=')
++ new_entries++;
++ fprintf(out_fp, " %10.0f %10.0f %10.0f %s\n",
++ (double)F_LENGTH(file), (double)file->modtime,
++ (double)ctime, file->basename);
++ if (file->modtime > ctime)
++ ctime = file->modtime;
++ if (ctime > latest_time)
++ latest_time = ctime;
++ }
++
++ fclose(out_fp);
++
++ if (whole_dir && new_entries == 0)
++ set_modtime(fbuf, latest_time, latest_time);
++ else
++ set_modtime(fbuf, latest_time-1, latest_time-1);
++}
++
+/* 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)
+ char line[MAXPATHLEN+1024], fbuf[MAXPATHLEN], sum[MAX_DIGEST_LEN];
+ const char *alt_sum = NULL;
+ OFF_T file_length;
-+ time_t mtime;
++ time_t mtime, ctime;
+ int len, dlen, i, flags;
+ char *cp;
+ FILE *fp;
+
++ write_checksums(dirname, 0);
++
+ if (checksum_flist) {
+ /* Reset the pool memory and empty the file-list array. */
+ pool_free_old(checksum_flist->file_pool,
+ checksum_flist->low = 0;
+ checksum_flist->high = -1;
+ checksum_matches = 0;
++ checksum_updates = 0;
++ regular_skipped = 0;
+
-+ if (dirname) {
-+ dlen = strlcpy(fbuf, dirname, sizeof fbuf);
-+ if (dlen >= (int)sizeof fbuf)
-+ return;
++ if (!dirname)
++ return;
++
++ dlen = strlcpy(fbuf, dirname, sizeof fbuf);
++ if (dlen >= (int)sizeof fbuf)
++ return;
++ if (dlen)
+ fbuf[dlen++] = '/';
-+ } else
-+ dlen = 0;
++ else
++ dirname = NULL;
+ strlcpy(fbuf+dlen, ".rsyncsums", sizeof fbuf - dlen);
+ if (!(fp = fopen(fbuf, "r")))
+ return;
+ break;
+ while (*++cp == ' ') {}
+
++ ctime = 0;
++ while (isDigit(cp))
++ ctime = ctime * 10 + *cp++ - '0';
++ if (*cp != ' ')
++ break;
++ while (*++cp == ' ') {}
++
+ len = strlen(cp);
+ while (len && (cp[len-1] == '\n' || cp[len-1] == '\r'))
+ len--;
+
+ strlcpy(fbuf+dlen, cp, sizeof fbuf - dlen);
+ if (is_excluded(fbuf, 0, ALL_FILTERS)) {
-+ flags |= FLAG_SUM_FOUND;
++ flags |= FLAG_SUM_KEEP;
+ checksum_matches++;
+ }
+
-+ add_checksum(dirname, cp, len, file_length, mtime,
++ add_checksum(dirname, cp, len, file_length, mtime, ctime,
+ sum, alt_sum, flags);
+ }
+ fclose(fp);
+
+ 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_matches = 0;
-+
-+ if (dry_run)
-+ return;
-+
-+ if (dirname) {
-+ if (pathjoin(buf, sizeof buf, dirname, ".rsyncsums") >= sizeof buf)
-+ return;
-+ } else
-+ strlcpy(buf, ".rsyncsums", sizeof buf);
-+
-+ if (checksum_flist->high - checksum_flist->low < 0) {
-+ unlink(buf);
-+ return;
-+ }
-+
-+ if (!new_entries && !orphan_entires)
-+ return;
-+
-+ if (!(out_fp = fopen(buf, "w")))
-+ return;
-+
-+ 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))
-+ continue;
-+ if (protocol_version >= 30) {
-+ fprintf(out_fp, "%s ",
-+ file->basename + strlen(file->basename) + 1);
-+ }
-+ if (file->flags & FLAG_SUM_MISSING) {
-+ do {
-+ fprintf(out_fp, "==");
-+ } while (++cp != end);
-+ } else {
-+ do {
-+ fprintf(out_fp, "%02x", 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);
-+ }
-+
-+ fclose(out_fp);
-+}
+
int push_pathname(const char *dir, int len)
{
if (dir == pathname)
-@@ -973,34 +1233,24 @@ static struct file_struct *recv_file_ent
+@@ -980,34 +1287,24 @@ static struct file_struct *recv_file_ent
return file;
}
+ STRUCT_STAT st;
char *bp;
- if (strlcpy(thisname, fname, sizeof thisname)
-@@ -1115,9 +1365,16 @@ struct file_struct *make_file(const char
+ if (strlcpy(thisname, fname, sizeof thisname) >= sizeof thisname) {
+@@ -1086,6 +1383,8 @@ struct file_struct *make_file(const char
+ 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;
+ }
+
+@@ -1124,9 +1423,16 @@ struct file_struct *make_file(const char
memcpy(lastdir, thisname, len);
lastdir[len] = '\0';
lastdir_len = len;
basename = thisname;
+ if (always_checksum && am_sender && flist && lastdir_len == -2) {
+ lastdir_len = -1;
-+ read_checksums(NULL);
++ read_checksums("");
+ }
+ }
basename_len = strlen(basename) + 1; /* count the '\0' */
#ifdef SUPPORT_LINKS
-@@ -1193,11 +1450,36 @@ struct file_struct *make_file(const char
+@@ -1202,11 +1508,44 @@ struct file_struct *make_file(const char
}
#endif
+ 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) {
++ time_t ctime;
++#if SIZEOF_TIME_T == 4
++ ctime = OPT_EXTRA(fp, LEN64_BUMP(fp) + SUM_EXTRA_CNT)->num;
++#else
++ memcpy(&ctime, F_SUM(fp) - SIZEOF_TIME_T, SIZEOF_TIME_T);
++#endif
++ if (F_LENGTH(fp) == st.st_size
++ && fp->modtime == st.st_mtime && ctime == st.st_ctime) {
+ if (fp->flags & FLAG_SUM_MISSING) {
+ fp->flags &= ~FLAG_SUM_MISSING;
+ 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:
++ 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);
++ st.st_size, st.st_mtime, st.st_ctime,
++ 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
+@@ -1499,6 +1838,9 @@ static void send_directory(int f, struct
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)
+ int i, end = flist->used - 1;
+ /* send_if_directory() bumps flist->used, so use "end". */
+@@ -1942,7 +2284,11 @@ struct file_list *send_file_list(int f,
+ * file-list to check if this is a 1-file xfer. */
+ send_extra_file_list(f, 1);
+ }
+- }
++ } else
++ flist_eof = 1;
++
++ if (checksum_updating && always_checksum && flist_eof)
++ read_checksums(NULL); /* writes any last updates */
+
+ return flist;
+ }
+@@ -2235,7 +2581,7 @@ void flist_free(struct file_list *flist)
if (!flist->prev || !flist_cnt)
pool_destroy(flist->file_pool);
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
+@@ -152,6 +152,7 @@ typedef struct
int syslog_facility;
int timeout;
BOOL fake_super;
BOOL ignore_errors;
BOOL ignore_nonreadable;
-@@ -197,6 +198,7 @@ static service sDefault =
+@@ -200,6 +201,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[] =
+@@ -316,6 +318,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},
{"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)
+@@ -421,6 +424,7 @@ 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)
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)
+@@ -303,6 +304,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[]
+@@ -544,6 +546,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
+@@ -1913,7 +1916,9 @@ void server_options(char **args,int *arg
args[ac++] = basis_dir[i];
}
}
args[ac++] = "--append";
--- old/rsync.h
+++ new/rsync.h
-@@ -1070,6 +1070,12 @@ isDigit(const char *ptr)
+@@ -592,6 +592,7 @@ extern int xattrs_ndx;
+ #define DEV_EXTRA_CNT 2
+ #define DIRNODE_EXTRA_CNT 3
+ #define SUM_EXTRA_CNT ((MAX_DIGEST_LEN + EXTRA_LEN - 1) / EXTRA_LEN)
++#define TIME_EXTRA_CNT ((SIZEOF_TIME_T + EXTRA_LEN - 1) / EXTRA_LEN)
+
+ #define REQ_EXTRA(f,ndx) ((union file_extras*)(f) - (ndx))
+ #define OPT_EXTRA(f,bump) ((union file_extras*)(f) - file_extra_cnt - 1 - (bump))
+@@ -1077,6 +1078,12 @@ isDigit(const char *ptr)
}
static inline int
return isprint(*(unsigned char *)ptr);
--- old/rsync.yo
+++ new/rsync.yo
-@@ -307,6 +307,7 @@ to the detailed description below for a
+@@ -322,6 +322,7 @@ to the detailed description below for a
-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
+@@ -518,9 +519,9 @@ uses a "quick check" that (by default) c
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
+@@ -528,12 +529,42 @@ its checksums when it is scanning for ch
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(read only)) The "read only" option determines whether clients
will be able to upload files or not. If "read only" is true then any
attempted uploads will fail. If "read only" is false then uploads will
+--- old/support/rsyncsums
++++ new/support/rsyncsums
+@@ -0,0 +1,184 @@
++#!/usr/bin/perl -w
++use strict;
++
++use Getopt::Long;
++use Cwd qw(abs_path cwd);
++use Digest::MD4;
++use Digest::MD5;
++
++our $SUMS_FILE = '.rsyncsums';
++
++our($recurse_opt, $force_reading, $help_opt);
++our $verbosity = 0;
++
++&Getopt::Long::Configure('bundling');
++&usage if !&GetOptions(
++ 'recurse|r' => \$recurse_opt,
++ 'force|f' => \$force_reading,
++ 'verbose|v+' => \$verbosity,
++ 'help|h' => \$help_opt,
++) || $help_opt;
++
++my $start_dir = cwd();
++
++my @dirs = @ARGV;
++@dirs = '.' unless @dirs;
++foreach (@dirs) {
++ $_ = abs_path($_);
++}
++
++$| = 1;
++
++my $md4 = Digest::MD4->new;
++my $md5 = Digest::MD5->new;
++
++while (@dirs) {
++ my $dir = shift @dirs;
++
++ if (!chdir($dir)) {
++ warn "Unable to chdir to $dir: $!\n";
++ next;
++ }
++ if (!opendir(DP, '.')) {
++ warn "Unable to opendir $dir: $!\n";
++ next;
++ }
++
++ if ($verbosity) {
++ my $reldir = $dir;
++ $reldir =~ s#^$start_dir(/|$)# $1 ? '' : '.' #eo;
++ print "$reldir ... ";
++ }
++
++ my $sums_mtime = (stat($SUMS_FILE))[9];
++ my %cache;
++ my @subdirs;
++ my $cnt = 0;
++ my $latest_time = 0;
++ while (defined(my $fn = readdir(DP))) {
++ next if $fn =~ /^\.\.?$/ || $fn =~ /^\Q$SUMS_FILE\E$/o || -l $fn;
++ if (-d _) {
++ push(@subdirs, "$dir/$fn");
++ next;
++ }
++ next unless -f _;
++
++ my($size,$mtime,$ctime) = (stat(_))[7,9,10];
++
++ $cache{$fn} = [ $size, $mtime, $ctime ];
++ $cnt++;
++
++ $latest_time = $mtime if $mtime > $latest_time;
++ $latest_time = $ctime if $ctime > $latest_time;
++ }
++
++ closedir DP;
++
++ unshift(@dirs, sort @subdirs) if $recurse_opt;
++
++ if (!$cnt) {
++ if (defined $sums_mtime) {
++ print "(removed $SUMS_FILE) " if $verbosity;
++ unlink($SUMS_FILE);
++ }
++ print "empty\n" if $verbosity;
++ next;
++ }
++
++ if (defined($sums_mtime) && $sums_mtime == $latest_time && !$force_reading) {
++ print "OK\n" if $verbosity;
++ next;
++ }
++
++ if (open(FP, '+<', $SUMS_FILE)) {
++ while (<FP>) {
++ chomp;
++ my($sum4, $sum5, $size, $mtime, $ctime, $fn) = split(' ', $_, 6);
++ my $ref = $cache{$fn};
++ if (defined $ref) {
++ if ($$ref[0] == $size
++ && $$ref[1] == $mtime && $$ref[2] == $ctime
++ && $sum4 !~ /=/ && $sum5 !~ /=/) {
++ $$ref[3] = $sum4;
++ $$ref[4] = $sum5;
++ $cnt--;
++ } else {
++ $$ref[3] = $$ref[4] = undef;
++ }
++ } else {
++ $cnt = -1; # Force rewrite due to removed line.
++ }
++ }
++ } else {
++ open(FP, '>', $SUMS_FILE) or die "Unable to write $dir/$SUMS_FILE: $!\n";
++ $cnt = -1;
++ }
++
++ if ($cnt) {
++ print "updating\n" if $verbosity;
++ while (my($fn, $ref) = each %cache) {
++ next if defined $$ref[3] && defined $$ref[4];
++ if (!open(IN, $fn)) {
++ print STDERR "Unable to read $fn: $!\n";
++ delete $cache{$fn};
++ next;
++ }
++
++ my($size,$mtime,$ctime) = (stat(IN))[7,9,10];
++ my($sum4, $sum5);
++
++ while (1) {
++ while (sysread(IN, $_, 64*1024)) {
++ $md4->add($_);
++ $md5->add($_);
++ }
++ $sum4 = $md4->hexdigest;
++ $sum5 = $md5->hexdigest;
++ print " $sum4 $sum5" if $verbosity > 2;
++ print " $fn\n" if $verbosity > 1;
++ my($size2,$mtime2,$ctime2) = (stat(IN))[7,9,10];
++ last if $size == $size2 && $mtime == $mtime2 && $ctime == $ctime2;
++ $size = $size2;
++ $mtime = $mtime2;
++ $ctime = $ctime2;
++ sysseek(IN, 0, 0);
++ }
++
++ close IN;
++
++ $cache{$fn} = [ $size, $mtime, $ctime, $sum4, $sum5 ];
++ }
++
++ $latest_time = 0;
++ seek(FP, 0, 0);
++ foreach my $fn (sort keys %cache) {
++ my $ref = $cache{$fn};
++ my($size, $mtime, $ctime, $sum4, $sum5) = @$ref;
++ printf FP '%s %s %10d %10d %10d %s' . "\n", $sum4, $sum5, $size, $mtime, $ctime, $fn;
++
++ $latest_time = $mtime if $mtime > $latest_time;
++ $latest_time = $ctime if $ctime > $latest_time;
++ }
++ truncate(FP, tell(FP));
++ } else {
++ print "OK.\n" if $verbosity;
++ }
++
++ close FP;
++
++ utime $latest_time, $latest_time, $SUMS_FILE;
++}
++
++sub usage
++{
++ die <<EOT;
++Usage: rsyncsums [OPTIONS] [DIRS]
++
++Options:
++ -r, --recurse Update $SUMS_FILE files in subdirectories too.
++ -f, --force Force the reading of an $SUMS_FILE file that looks to be
++ up-to-date. (Useful for weeding out old entries.)
++ -v, --verbose Mention what we're doing. Repeat for more info.
++ -h, --help Display this help message.
++EOT
++}