extern int size_only;
extern OFF_T max_size;
extern OFF_T min_size;
-@@ -620,7 +621,7 @@ void itemize(const char *fnamecmp, struc
+@@ -619,7 +620,7 @@ void itemize(const char *fnamecmp, struc
/* 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
--- old/main.c
+++ new/main.c
-@@ -127,7 +127,7 @@ pid_t wait_process(pid_t pid, int *statu
+@@ -132,7 +132,7 @@ pid_t wait_process(pid_t pid, int *statu
}
/* Wait for a process to exit, calling io_flush while waiting. */
int status;
--- old/options.c
+++ new/options.c
-@@ -101,6 +101,7 @@ int keep_partial = 0;
+@@ -102,6 +102,7 @@ int keep_partial = 0;
int safe_symlinks = 0;
int copy_unsafe_links = 0;
int size_only = 0;
int daemon_bwlimit = 0;
int bwlimit = 0;
int fuzzy_basis = 0;
-@@ -152,6 +153,8 @@ char *logfile_name = NULL;
+@@ -159,6 +160,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];
-@@ -370,6 +373,7 @@ void usage(enum logcode F)
+@@ -379,6 +382,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");
-@@ -407,6 +411,8 @@ void usage(enum logcode F)
+@@ -418,6 +422,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 filesnames\n");
-@@ -506,6 +512,7 @@ static struct poptOption long_options[]
+@@ -520,6 +526,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 },
-@@ -601,6 +608,8 @@ static struct poptOption long_options[]
+@@ -619,6 +626,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 },
-@@ -1531,6 +1540,16 @@ int parse_arguments(int *argc, const cha
+@@ -1575,6 +1584,16 @@ int parse_arguments(int *argc_p, const c
}
}
if (files_from) {
char *h, *p;
int q;
-@@ -1840,6 +1859,25 @@ void server_options(char **args,int *arg
- args[ac++] = "--size-only";
+@@ -1895,6 +1914,25 @@ void server_options(char **args, int *ar
+ }
}
+ if (times_only && am_sender)
goto oom;
--- old/pipe.c
+++ new/pipe.c
-@@ -163,3 +163,77 @@ pid_t local_child(int argc, char **argv,
+@@ -164,3 +164,77 @@ pid_t local_child(int argc, char **argv,
return pid;
}
+ int pipefds[2];
+
+ if (verbose >= 2)
-+ print_child_argv(command);
++ print_child_argv("opening connection using:", command);
+
+ if (pipe(pipefds) < 0) {
+ rsyserr(FERROR, errno, "pipe");
+ pid_t pid;
+
+ if (verbose >= 2)
-+ print_child_argv(command);
++ print_child_argv("opening connection using:", command);
+
+ pid = do_fork();
+ if (pid == -1) {
+}
--- old/receiver.c
+++ new/receiver.c
-@@ -51,6 +51,7 @@ extern int delay_updates;
+@@ -52,6 +52,7 @@ extern int delay_updates;
extern mode_t orig_umask;
extern struct stats stats;
extern char *tmpdir;
extern char *partial_dir;
extern char *basis_dir[];
extern struct file_list *cur_flist, *first_flist, *dir_flist;
-@@ -354,6 +355,8 @@ int recv_files(int f_in, char *local_nam
+@@ -357,6 +358,8 @@ int recv_files(int f_in, char *local_nam
const char *parent_dirname = "";
#endif
int ndx, recv_ok;
if (verbose > 2)
rprintf(FINFO, "recv_files(%d) starting\n", cur_flist->used);
-@@ -363,6 +366,23 @@ int recv_files(int f_in, char *local_nam
+@@ -366,6 +369,23 @@ int recv_files(int f_in, char *local_nam
updating_basis = inplace;
while (1) {
cleanup_disable();
-@@ -658,6 +678,9 @@ int recv_files(int f_in, char *local_nam
+@@ -663,6 +683,9 @@ int recv_files(int f_in, char *local_nam
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, F_LENGTH(file));
-@@ -672,6 +695,16 @@ int recv_files(int f_in, char *local_nam
+@@ -677,6 +700,16 @@ int recv_files(int f_in, char *local_nam
exit_cleanup(RERR_FILEIO);
}
if (partialptr == fname)
--- old/rsync.h
+++ new/rsync.h
-@@ -126,6 +126,7 @@
+@@ -128,6 +128,7 @@
#define IOERR_DEL_LIMIT (1<<2)
#define MAX_ARGS 1000
--- old/rsync.yo
+++ new/rsync.yo
-@@ -370,6 +370,7 @@ to the detailed description below for a
+@@ -386,6 +386,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
-@@ -407,6 +408,8 @@ to the detailed description below for a
+@@ -424,6 +425,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
--iconv=CONVERT_SPEC request charset conversion of filesnames
--checksum-seed=NUM set block/file checksum seed (advanced)
-@@ -1865,6 +1868,33 @@ file previously generated by bf(--write-
+@@ -1936,6 +1939,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.
version of rsync. For instance, if rsync 2.6.4 is being used with the
--- old/sender.c
+++ new/sender.c
-@@ -42,6 +42,7 @@ extern int do_progress;
+@@ -43,6 +43,7 @@ extern int do_progress;
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;
-@@ -180,6 +181,26 @@ void send_files(int f_in, int f_out)
+@@ -181,6 +182,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)
rprintf(FINFO, "send_files starting\n");
-@@ -283,6 +304,7 @@ void send_files(int f_in, int f_out)
+@@ -284,6 +305,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) {
-@@ -313,6 +335,33 @@ void send_files(int f_in, int f_out)
+@@ -314,6 +336,33 @@ void send_files(int f_in, int f_out)
exit_cleanup(RERR_PROTOCOL);
}
if (st.st_size) {
int32 read_size = MAX(s->blength * 3, MAX_MAP_SIZE);
mbuf = map_file(fd, st.st_size, read_size, s->blength);
-@@ -354,6 +403,8 @@ void send_files(int f_in, int f_out)
+@@ -355,6 +404,8 @@ void send_files(int f_in, int f_out)
}
}
close(fd);
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff