- If the COMMAND contains single quotes, option-passing breaks. (Needs
to be fixed.)
-After applying this patch, run these commands for a successful build:
+To use this patch, run these commands for a successful build:
+ patch -p1 <patches/source-filter_dest-filter.diff
./prepare-source
- ./configure (optional if already run)
+ ./configure (optional if already run)
make
--- old/generator.c
char *rsync_path = RSYNC_PATH;
char *backup_dir = NULL;
char backup_dir_buf[MAXPATHLEN];
-@@ -341,6 +344,7 @@ void usage(enum logcode F)
+@@ -343,6 +346,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");
-@@ -378,6 +382,8 @@ void usage(enum logcode F)
+@@ -380,6 +384,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");
-@@ -459,6 +465,7 @@ static struct poptOption long_options[]
+@@ -463,6 +469,7 @@ static struct poptOption long_options[]
{"chmod", 0, POPT_ARG_STRING, 0, OPT_CHMOD, 0, 0 },
{"ignore-times", 'I', POPT_ARG_NONE, &ignore_times, 0, 0, 0 },
{"size-only", 0, POPT_ARG_NONE, &size_only, 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 },
-@@ -537,6 +544,8 @@ static struct poptOption long_options[]
+@@ -541,6 +548,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, 0, OPT_SERVER, 0, 0 },
-@@ -1403,6 +1412,16 @@ int parse_arguments(int *argc, const cha
+@@ -1410,6 +1419,16 @@ int parse_arguments(int *argc, const cha
}
}
if (files_from) {
char *h, *p;
int q;
-@@ -1669,6 +1688,25 @@ void server_options(char **args,int *arg
+@@ -1676,6 +1695,25 @@ void server_options(char **args,int *arg
args[ac++] = "--size-only";
}
extern char *stdout_format;
extern char *tmpdir;
extern char *partial_dir;
-@@ -350,6 +351,8 @@ int recv_files(int f_in, struct file_lis
+@@ -351,6 +352,8 @@ int recv_files(int f_in, struct file_lis
enum logcode log_code = log_before_transfer ? FLOG : FINFO;
int max_phase = protocol_version >= 29 ? 2 : 1;
int i, recv_ok;
if (verbose > 2)
rprintf(FINFO,"recv_files(%d) starting\n",flist->count);
-@@ -364,6 +367,23 @@ int recv_files(int f_in, struct file_lis
+@@ -365,6 +368,23 @@ int recv_files(int f_in, struct file_lis
updating_basis = inplace;
while (1) {
cleanup_disable();
-@@ -606,6 +626,9 @@ int recv_files(int f_in, struct file_lis
+@@ -610,6 +630,9 @@ int recv_files(int f_in, struct file_lis
else if (!am_server && verbose && do_progress)
rprintf(FINFO, "%s\n", fname);
/* recv file data */
recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size,
fname, fd2, file->length);
-@@ -620,6 +643,16 @@ int recv_files(int f_in, struct file_lis
+@@ -624,6 +647,16 @@ int recv_files(int f_in, struct file_lis
exit_cleanup(RERR_FILEIO);
}
--- old/rsync.yo
+++ new/rsync.yo
-@@ -359,6 +359,7 @@ to the detailed description below for a
+@@ -360,6 +360,7 @@ to the detailed description below for a
--timeout=TIME set I/O timeout in seconds
-I, --ignore-times don't skip files that match size and time
--size-only skip files that match in size
--modify-window=NUM compare mod-times with reduced accuracy
-T, --temp-dir=DIR create temporary files in directory DIR
-y, --fuzzy find similar file for basis if no dest file
-@@ -396,6 +397,8 @@ to the detailed description below for a
+@@ -397,6 +398,8 @@ to the detailed description below for a
--write-batch=FILE write a batched update to FILE
--only-write-batch=FILE like --write-batch but w/o updating dest
--read-batch=FILE read a batched update from FILE
--protocol=NUM force an older protocol version to be used
--checksum-seed=NUM set block/file checksum seed (advanced)
-4, --ipv4 prefer IPv4
-@@ -1753,6 +1756,33 @@ file previously generated by bf(--write-
+@@ -1759,6 +1762,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.
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff