X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/ae306a2933c7617493d80f46d891911634ec43d0..0ef5abcbbb95298fa9faf1d3eb275a9e76e1d951:/db.diff diff --git a/db.diff b/db.diff index 515f4a0..479fd6b 100644 --- a/db.diff +++ b/db.diff @@ -123,7 +123,7 @@ diff --git a/clientserver.c b/clientserver.c extern char *bind_address; extern char *sockopts; extern char *config_file; -@@ -552,6 +555,9 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host) +@@ -564,6 +567,9 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host) log_init(1); @@ -133,7 +133,7 @@ diff --git a/clientserver.c b/clientserver.c #ifdef HAVE_PUTENV if (*lp_prexfer_exec(i) || *lp_postxfer_exec(i)) { char *modname, *modpath, *hostaddr, *hostname, *username; -@@ -768,6 +774,10 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host) +@@ -767,6 +773,10 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host) am_server = 1; /* Don't let someone try to be tricky. */ quiet = 0; @@ -785,10 +785,10 @@ diff --git a/flist.c b/flist.c + file_checksum(thisname, &st, tmp_sum); + } + - /* 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) { -@@ -1953,6 +1956,9 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) + if (basename_len == 0+1) { + if (!pool) + unmake_file(file); +@@ -1936,6 +1939,9 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) | (eol_nulls || reading_remotely ? RL_EOL_NULLS : 0); int implied_dot_dir = 0; @@ -809,7 +809,7 @@ diff --git a/generator.c b/generator.c extern int append_mode; extern int make_backups; extern int csum_length; -@@ -722,7 +723,8 @@ int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st) +@@ -724,7 +725,8 @@ int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st) of the file time to determine whether to sync */ if (always_checksum > 0 && S_ISREG(st->st_mode)) { char sum[MAX_DIGEST_LEN]; @@ -819,7 +819,7 @@ diff --git a/generator.c b/generator.c return memcmp(sum, F_SUM(file), checksum_len) == 0; } -@@ -2205,6 +2207,9 @@ void generate_files(int f_out, const char *local_name) +@@ -2206,6 +2208,9 @@ void generate_files(int f_out, const char *local_name) : "enabled"); } @@ -875,7 +875,7 @@ diff --git a/main.c b/main.c extern int file_total; extern int recurse; extern int xfer_dirs; -@@ -76,6 +77,7 @@ extern char *partial_dir; +@@ -73,6 +74,7 @@ extern char *partial_dir; extern char *dest_option; extern char *basis_dir[]; extern char *rsync_path; @@ -883,7 +883,7 @@ diff --git a/main.c b/main.c extern char *shell_cmd; extern char *batch_name; extern char *password_file; -@@ -1496,6 +1498,9 @@ int main(int argc,char *argv[]) +@@ -1491,6 +1493,9 @@ int main(int argc,char *argv[]) exit_cleanup(RERR_SYNTAX); } @@ -912,7 +912,7 @@ diff --git a/options.c b/options.c STRUCT_STAT *dumstat; #if SUBPROTOCOL_VERSION != 0 -@@ -261,6 +263,11 @@ static void print_rsync_version(enum logcode f) +@@ -262,6 +264,11 @@ static void print_rsync_version(enum logcode f) #if defined HAVE_LUTIMES && defined HAVE_UTIMES symtimes = ""; #endif @@ -924,7 +924,7 @@ diff --git a/options.c b/options.c rprintf(f, "%s version %s protocol version %d%s\n", RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION, subprotocol); -@@ -274,8 +281,8 @@ static void print_rsync_version(enum logcode f) +@@ -275,8 +282,8 @@ static void print_rsync_version(enum logcode f) (int)(sizeof (int64) * 8)); rprintf(f, " %ssocketpairs, %shardlinks, %ssymlinks, %sIPv6, batchfiles, %sinplace,\n", got_socketpair, hardlinks, links, ipv6, have_inplace); @@ -935,7 +935,7 @@ diff --git a/options.c b/options.c #ifdef MAINTAINER_MODE rprintf(f, "Panic Action: \"%s\"\n", get_panic_action()); -@@ -321,6 +328,7 @@ void usage(enum logcode F) +@@ -322,6 +329,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"); @@ -943,7 +943,7 @@ diff --git a/options.c b/options.c 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"); -@@ -579,6 +587,7 @@ static struct poptOption long_options[] = { +@@ -580,6 +588,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 }, @@ -986,7 +986,7 @@ diff --git a/pipe.c b/pipe.c 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( +@@ -321,6 +321,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 @@ -994,7 +994,7 @@ diff --git a/rsync.yo b/rsync.yo -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 -@@ -533,6 +534,47 @@ checksum that is generated as the file is transferred, but that +@@ -537,6 +538,47 @@ checksum that is generated as the file is transferred, but that automatic after-the-transfer verification has nothing to do with this option's before-the-transfer "Does this file need to be updated?" check. @@ -1068,9 +1068,10 @@ diff --git a/support/rsyncdb b/support/rsyncdb new file mode 100755 --- /dev/null +++ b/support/rsyncdb -@@ -0,0 +1,331 @@ -+#!/usr/bin/perl -w +@@ -0,0 +1,332 @@ ++#!/usr/bin/perl +use strict; ++use warnings; + +use DBI; +use Getopt::Long;