You should run "make proto" before running "make".
---- orig/generator.c 2006-01-14 08:14:30
+--- orig/generator.c 2006-01-20 21:12:17
+++ generator.c 2005-08-17 07:28:01
@@ -59,6 +59,7 @@ extern int append_mode;
extern int make_backups;
return 0;
/* if always checksum is set then we use the checksum instead
---- orig/options.c 2006-01-14 08:14:30
-+++ options.c 2005-08-27 21:27:17
+--- orig/options.c 2006-01-21 07:55:00
++++ options.c 2006-01-21 08:09:48
@@ -93,6 +93,7 @@ int keep_partial = 0;
int safe_symlinks = 0;
int copy_unsafe_links = 0;
char *password_file = NULL;
char *rsync_path = RSYNC_PATH;
char *backup_dir = NULL;
-@@ -324,6 +327,7 @@ void usage(enum logcode F)
+@@ -321,6 +324,7 @@ void usage(enum logcode F)
rprintf(F," --timeout=TIME set I/O timeout in seconds\n");
rprintf(F," -I, --ignore-times don't skip files that match in size and mod-time\n");
rprintf(F," --size-only skip files that match in size\n");
rprintf(F," --modify-window=NUM compare mod-times with reduced accuracy\n");
rprintf(F," -T, --temp-dir=DIR create temporary files in directory DIR\n");
rprintf(F," -y, --fuzzy find similar file for basis if no dest file\n");
-@@ -358,6 +362,8 @@ void usage(enum logcode F)
+@@ -355,6 +359,8 @@ void usage(enum logcode F)
rprintf(F," --write-batch=FILE write a batched update to FILE\n");
rprintf(F," --only-write-batch=FILE like --write-batch but w/o updating destination\n");
rprintf(F," --read-batch=FILE read a batched update from FILE\n");
rprintf(F," --protocol=NUM force an older protocol version to be used\n");
#ifdef INET6
rprintf(F," -4, --ipv4 prefer IPv4\n");
-@@ -428,6 +434,7 @@ static struct poptOption long_options[]
+@@ -425,6 +431,7 @@ static struct poptOption long_options[]
{"chmod", 0, POPT_ARG_STRING, &chmod_mode, 0, 0, 0 },
{"ignore-times", 'I', POPT_ARG_NONE, &ignore_times, 0, 0, 0 },
{"size-only", 0, POPT_ARG_NONE, &size_only, 0, 0, 0 },
+ {"times-only", 0, POPT_ARG_NONE, ×_only , 0, 0, 0 },
- {"one-file-system", 'x', POPT_ARG_NONE, &one_file_system, 0, 0, 0 },
+ {"one-file-system", 'x', POPT_ARG_NONE, 0, 'x', 0, 0 },
{"update", 'u', POPT_ARG_NONE, &update_only, 0, 0, 0 },
{"existing", 0, POPT_ARG_NONE, &ignore_non_existing, 0, 0, 0 },
-@@ -499,6 +506,8 @@ static struct poptOption long_options[]
+@@ -496,6 +503,8 @@ static struct poptOption long_options[]
{"password-file", 0, POPT_ARG_STRING, &password_file, 0, 0, 0 },
{"blocking-io", 0, POPT_ARG_VAL, &blocking_io, 1, 0, 0 },
{"no-blocking-io", 0, POPT_ARG_VAL, &blocking_io, 0, 0, 0 },
{"protocol", 0, POPT_ARG_INT, &protocol_version, 0, 0, 0 },
{"checksum-seed", 0, POPT_ARG_INT, &checksum_seed, 0, 0, 0 },
{"server", 0, POPT_ARG_NONE, &am_server, 0, 0, 0 },
-@@ -1324,6 +1333,16 @@ int parse_arguments(int *argc, const cha
+@@ -1331,6 +1340,16 @@ int parse_arguments(int *argc, const cha
}
}
if (files_from) {
char *h, *p;
int q;
-@@ -1558,6 +1577,25 @@ void server_options(char **args,int *arg
+@@ -1570,6 +1589,25 @@ void server_options(char **args,int *arg
args[ac++] = "--only-write-batch=X";
}
if (size_only)
args[ac++] = "--size-only";
---- orig/pipe.c 2006-01-14 08:14:31
+--- orig/pipe.c 2006-01-21 08:03:40
+++ pipe.c 2006-01-14 08:34:59
@@ -157,3 +157,77 @@ pid_t local_child(int argc, char **argv,
+
+ return pid;
+}
---- orig/receiver.c 2006-01-14 08:14:31
+--- orig/receiver.c 2006-01-14 20:27:09
+++ receiver.c 2005-08-17 07:57:33
@@ -53,6 +53,7 @@ extern int inplace;
extern int delay_updates;
if ((recv_ok && (!delay_updates || !partialptr)) || inplace) {
finish_transfer(fname, fnametmp, file, recv_ok, 1);
if (partialptr != fname && fnamecmp == partialptr) {
---- orig/rsync.h 2006-01-14 08:14:31
+--- orig/rsync.h 2006-01-14 20:27:10
+++ rsync.h 2005-08-17 07:10:11
@@ -103,6 +103,7 @@
#define IOERR_DEL_LIMIT (1<<2)
#define MAX_BASIS_DIRS 20
#define MAX_SERVER_ARGS (MAX_BASIS_DIRS*2 + 100)
---- orig/rsync.yo 2006-01-14 08:14:31
+--- orig/rsync.yo 2006-01-21 08:12:23
+++ rsync.yo 2005-08-17 07:08:21
@@ -350,6 +350,7 @@ to the detailed description below for a
--timeout=TIME set I/O timeout in seconds
--protocol=NUM force an older protocol version to be used
--checksum-seed=NUM set block/file checksum seed (advanced)
-4, --ipv4 prefer IPv4
-@@ -1411,6 +1414,33 @@ file previously generated by bf(--write-
+@@ -1430,6 +1433,33 @@ file previously generated by bf(--write-
If em(FILE) is bf(-), the batch data will be read from standard input.
See the "BATCH MODE" section for details.
dit(bf(--protocol=NUM)) Force an older protocol version to be used. This
is useful for creating a batch file that is compatible with an older
version of rsync. For instance, if rsync 2.6.4 is being used with the
---- orig/sender.c 2006-01-14 08:14:31
+--- orig/sender.c 2006-01-14 20:27:10
+++ sender.c 2005-08-17 07:40:49
@@ -41,6 +41,7 @@ extern int write_batch;
extern struct stats stats;
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff