make
diff --git a/generator.c b/generator.c
+index 12007a1..88bd5e7 100644
--- a/generator.c
+++ b/generator.c
-@@ -62,6 +62,7 @@ extern int append_mode;
+@@ -64,6 +64,7 @@ extern int append_mode;
extern int make_backups;
extern int csum_length;
extern int ignore_times;
extern int size_only;
extern OFF_T max_size;
extern OFF_T min_size;
-@@ -717,7 +718,7 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
+@@ -524,7 +525,7 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
/* Perform our quick-check heuristic for determining if a file is unchanged. */
int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
{
/* if always checksum is set then we use the checksum instead
diff --git a/main.c b/main.c
+index 2ef2f47..e7b4a05 100644
--- a/main.c
+++ b/main.c
-@@ -136,7 +136,7 @@ pid_t wait_process(pid_t pid, int *status_ptr, int flags)
+@@ -140,7 +140,7 @@ pid_t wait_process(pid_t pid, int *status_ptr, int flags)
}
/* Wait for a process to exit, calling io_flush while waiting. */
pid_t waited_pid;
int status;
diff --git a/options.c b/options.c
+index e7c6c61..059bcbf 100644
--- a/options.c
+++ b/options.c
-@@ -106,6 +106,7 @@ int keep_partial = 0;
- int safe_symlinks = 0;
+@@ -105,6 +105,7 @@ int safe_symlinks = 0;
int copy_unsafe_links = 0;
+ int munge_symlinks = 0;
int size_only = 0;
+int times_only = 0;
int daemon_bwlimit = 0;
int bwlimit = 0;
int fuzzy_basis = 0;
-@@ -163,6 +164,8 @@ char *logfile_name = NULL;
+@@ -164,6 +165,8 @@ char *logfile_name = NULL;
char *logfile_format = NULL;
char *stdout_format = NULL;
char *password_file = NULL;
char *rsync_path = RSYNC_PATH;
char *backup_dir = NULL;
char backup_dir_buf[MAXPATHLEN];
-@@ -389,6 +392,7 @@ void usage(enum logcode F)
- rprintf(F," --contimeout=SECONDS set daemon connection timeout in seconds\n");
+@@ -739,6 +742,7 @@ void usage(enum logcode F)
rprintf(F," -I, --ignore-times don't skip files that match in size and mod-time\n");
+ rprintf(F," -M, --remote-option=OPTION send OPTION to the remote side only\n");
rprintf(F," --size-only skip files that match in size\n");
+ rprintf(F," --times-only skip files that match in mod-time\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");
-@@ -428,6 +432,8 @@ void usage(enum logcode F)
+@@ -778,6 +782,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 ICONV_OPTION
rprintf(F," --iconv=CONVERT_SPEC request charset conversion of filenames\n");
-@@ -531,6 +537,7 @@ static struct poptOption long_options[] = {
+@@ -887,6 +893,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 },
{"no-one-file-system",'x',POPT_ARG_VAL, &one_file_system, 0, 0, 0 },
{"no-x", 'x', POPT_ARG_VAL, &one_file_system, 0, 0, 0 },
-@@ -646,6 +653,8 @@ static struct poptOption long_options[] = {
+@@ -1007,6 +1014,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 },
+ {"source-filter", 0, POPT_ARG_STRING, &source_filter, 0, 0, 0 },
+ {"dest-filter", 0, POPT_ARG_STRING, &dest_filter, 0, 0, 0 },
+ {"remote-option", 'M', POPT_ARG_STRING, 0, 'M', 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 },
-@@ -1635,6 +1644,16 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -2149,6 +2158,16 @@ int parse_arguments(int *argc_p, const char ***argv_p)
}
}
if (files_from) {
char *h, *p;
int q;
-@@ -1969,6 +1988,25 @@ void server_options(char **args, int *argc_p)
- }
- }
+@@ -2493,6 +2512,25 @@ void server_options(char **args, int *argc_p)
+ else if (missing_args == 1 && !am_sender)
+ args[ac++] = "--ignore-missing-args";
+ if (times_only && am_sender)
+ args[ac++] = "--times-only";
if (asprintf(&arg, "--modify-window=%d", modify_window) < 0)
goto oom;
diff --git a/pipe.c b/pipe.c
+index a33117c..43eea31 100644
--- a/pipe.c
+++ b/pipe.c
-@@ -167,3 +167,77 @@ pid_t local_child(int argc, char **argv, int *f_in, int *f_out,
+@@ -180,3 +180,77 @@ pid_t local_child(int argc, char **argv, int *f_in, int *f_out,
return pid;
}
+ pid_t pid;
+ int pipefds[2];
+
-+ if (verbose >= 2)
++ if (DEBUG_GTE(CMD, 1))
+ print_child_argv("opening connection using:", command);
+
+ if (pipe(pipefds) < 0) {
+{
+ pid_t pid;
+
-+ if (verbose >= 2)
++ if (DEBUG_GTE(CMD, 1))
+ print_child_argv("opening connection using:", command);
+
+ pid = do_fork();
+ return pid;
+}
diff --git a/receiver.c b/receiver.c
+index 4325e30..e5ede73 100644
--- a/receiver.c
+++ b/receiver.c
@@ -52,6 +52,7 @@ extern int delay_updates;
extern char *tmpdir;
+extern char *dest_filter;
extern char *partial_dir;
- extern char *basis_dir[];
- extern struct file_list *cur_flist, *first_flist, *dir_flist;
-@@ -433,6 +434,8 @@ int recv_files(int f_in, char *local_name)
+ extern char *basis_dir[MAX_BASIS_DIRS+1];
+ extern char sender_file_sum[MAX_DIGEST_LEN];
+@@ -441,6 +442,8 @@ int recv_files(int f_in, char *local_name)
const char *parent_dirname = "";
#endif
int ndx, recv_ok;
+ pid_t pid = 0;
+ char *filter_argv[MAX_FILTER_ARGS + 1];
- if (verbose > 2)
+ if (DEBUG_GTE(RECV, 1))
rprintf(FINFO, "recv_files(%d) starting\n", cur_flist->used);
-@@ -440,6 +443,23 @@ int recv_files(int f_in, char *local_name)
+@@ -448,6 +451,23 @@ int recv_files(int f_in, char *local_name)
if (delay_updates)
delayed_bits = bitbag_create(cur_flist->used + 1);
while (1) {
cleanup_disable();
-@@ -706,6 +726,9 @@ int recv_files(int f_in, char *local_name)
- else if (!am_server && verbose && do_progress)
+@@ -742,6 +762,9 @@ int recv_files(int f_in, char *local_name)
+ else if (!am_server && INFO_GTE(NAME, 1) && INFO_EQ(PROGRESS, 1))
rprintf(FINFO, "%s\n", fname);
+ if (dest_filter)
/* recv file data */
recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size,
fname, fd2, F_LENGTH(file));
-@@ -720,6 +743,16 @@ int recv_files(int f_in, char *local_name)
+@@ -756,6 +779,16 @@ int recv_files(int f_in, char *local_name)
exit_cleanup(RERR_FILEIO);
}
if (partialptr == fname)
partialptr = NULL;
diff --git a/rsync.h b/rsync.h
+index be7cf8a..8d78818 100644
--- a/rsync.h
+++ b/rsync.h
-@@ -137,6 +137,7 @@
+@@ -138,6 +138,7 @@
#define IOERR_DEL_LIMIT (1<<2)
#define MAX_ARGS 1000
#define MAX_SERVER_ARGS (MAX_BASIS_DIRS*2 + 100)
diff --git a/rsync.yo b/rsync.yo
+index 941f7a5..edfad5e 100644
--- a/rsync.yo
+++ b/rsync.yo
-@@ -386,6 +386,7 @@ to the detailed description below for a complete description. verb(
+@@ -394,6 +394,7 @@ to the detailed description below for a complete description. verb(
--contimeout=SECONDS set daemon connection 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
-@@ -425,6 +426,8 @@ to the detailed description below for a complete description. verb(
+@@ -434,6 +435,8 @@ to the detailed description below for a complete description. verb(
--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
--iconv=CONVERT_SPEC request charset conversion of filenames
--checksum-seed=NUM set block/file checksum seed (advanced)
-@@ -2055,6 +2058,33 @@ file previously generated by bf(--write-batch).
+@@ -2256,6 +2259,33 @@ file previously generated by bf(--write-batch).
If em(FILE) is bf(-), the batch data will be read from standard input.
See the "BATCH MODE" section for details.
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
diff --git a/sender.c b/sender.c
+index bf8221d..f315f80 100644
--- a/sender.c
+++ b/sender.c
-@@ -43,6 +43,7 @@ extern int do_progress;
+@@ -42,6 +42,7 @@ extern int make_backups;
extern int inplace;
extern int batch_fd;
extern int write_batch;
extern struct stats stats;
extern struct file_list *cur_flist, *first_flist, *dir_flist;
-@@ -175,6 +176,26 @@ void send_files(int f_in, int f_out)
+@@ -174,6 +175,26 @@ void send_files(int f_in, int f_out)
enum logcode log_code = log_before_transfer ? FLOG : FINFO;
int f_xfer = write_batch < 0 ? batch_fd : f_out;
int ndx, j;
+ }
+ }
- if (verbose > 2)
+ if (DEBUG_GTE(SEND, 1))
rprintf(FINFO, "send_files starting\n");
-@@ -279,6 +300,7 @@ void send_files(int f_in, int f_out)
+@@ -299,6 +320,7 @@ void send_files(int f_in, int f_out)
exit_cleanup(RERR_PROTOCOL);
}
fd = do_open(fname, O_RDONLY, 0);
if (fd == -1) {
if (errno == ENOENT) {
-@@ -300,6 +322,33 @@ void send_files(int f_in, int f_out)
+@@ -320,6 +342,33 @@ void send_files(int f_in, int f_out)
continue;
}
/* map the local file */
if (do_fstat(fd, &st) != 0) {
io_error |= IOERR_GENERAL;
-@@ -350,6 +399,8 @@ void send_files(int f_in, int f_out)
+@@ -370,6 +419,8 @@ void send_files(int f_in, int f_out)
}
}
close(fd);
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff