extern int size_only;
extern OFF_T max_size;
extern OFF_T min_size;
-@@ -379,7 +380,7 @@ void itemize(struct file_struct *file, i
+@@ -376,7 +377,7 @@ void itemize(struct file_struct *file, i
/* 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
-@@ -110,7 +110,7 @@ pid_t wait_process(pid_t pid, int *statu
+@@ -119,7 +119,7 @@ pid_t wait_process(pid_t pid, int *statu
}
/* Wait for a process to exit, calling io_flush while waiting. */
int daemon_bwlimit = 0;
int bwlimit = 0;
int fuzzy_basis = 0;
-@@ -148,6 +149,8 @@ char *basis_dir[MAX_BASIS_DIRS+1];
- char *config_file = NULL;
- char *shell_cmd = NULL;
- char *log_format = NULL;
+@@ -151,6 +152,8 @@ char *log_format = NULL;
+ char *logfile_name = NULL;
+ char *logfile_format = NULL;
+ char *password_file = NULL;
+char *source_filter = NULL;
+char *dest_filter = NULL;
- char *password_file = NULL;
char *rsync_path = RSYNC_PATH;
char *backup_dir = NULL;
-@@ -332,6 +335,7 @@ void usage(enum logcode F)
+ char backup_dir_buf[MAXPATHLEN];
+@@ -337,6 +340,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");
-@@ -367,6 +371,8 @@ void usage(enum logcode F)
+@@ -373,6 +377,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");
-@@ -443,6 +449,7 @@ static struct poptOption long_options[]
+@@ -453,6 +459,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 },
-@@ -517,6 +524,8 @@ static struct poptOption long_options[]
+@@ -528,6 +535,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 },
-@@ -1385,6 +1394,16 @@ int parse_arguments(int *argc, const cha
+@@ -1406,6 +1415,16 @@ int parse_arguments(int *argc, const cha
}
}
if (files_from) {
char *h, *p;
int q;
-@@ -1647,6 +1666,25 @@ void server_options(char **args,int *arg
+@@ -1671,6 +1690,25 @@ void server_options(char **args,int *arg
args[ac++] = "--size-only";
}
goto oom;
--- old/pipe.c
+++ new/pipe.c
-@@ -157,3 +157,77 @@ pid_t local_child(int argc, char **argv,
+@@ -159,3 +159,77 @@ pid_t local_child(int argc, char **argv,
return pid;
}
+}
--- old/receiver.c
+++ new/receiver.c
-@@ -53,6 +53,7 @@ extern int inplace;
+@@ -49,6 +49,7 @@ extern int inplace;
extern int delay_updates;
extern struct stats stats;
extern char *log_format;
extern char *tmpdir;
extern char *partial_dir;
extern char *basis_dir[];
-@@ -350,6 +351,8 @@ int recv_files(int f_in, struct file_lis
- : !am_server && log_format_has_i;
+@@ -345,6 +346,8 @@ int recv_files(int f_in, struct file_lis
+ int itemizing = am_server ? logfile_format_has_i : log_format_has_i;
int max_phase = protocol_version >= 29 ? 2 : 1;
int i, recv_ok;
+ pid_t pid = 0;
if (verbose > 2)
rprintf(FINFO,"recv_files(%d) starting\n",flist->count);
-@@ -362,6 +365,23 @@ int recv_files(int f_in, struct file_lis
+@@ -357,6 +360,23 @@ int recv_files(int f_in, struct file_lis
if (delay_updates)
delayed_bits = bitbag_create(flist->count);
while (1) {
cleanup_disable();
-@@ -604,6 +624,9 @@ int recv_files(int f_in, struct file_lis
+@@ -599,6 +619,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);
-@@ -619,6 +642,16 @@ int recv_files(int f_in, struct file_lis
+@@ -614,6 +637,16 @@ int recv_files(int f_in, struct file_lis
exit_cleanup(RERR_FILEIO);
}
+ }
+
if ((recv_ok && (!delay_updates || !partialptr)) || inplace) {
- if (partialptr == fname || *partial_dir == '/')
- partialptr = NULL;
+ char *temp_copy_name;
+ if (partialptr == fname)
--- old/rsync.h
+++ new/rsync.h
@@ -103,6 +103,7 @@
--- old/rsync.yo
+++ new/rsync.yo
-@@ -355,6 +355,7 @@ to the detailed description below for a
+@@ -359,6 +359,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
-@@ -390,6 +391,8 @@ to the detailed description below for a
+@@ -395,6 +396,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
-@@ -1609,6 +1612,33 @@ file previously generated by bf(--write-
+@@ -1732,6 +1735,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
-@@ -41,6 +41,7 @@ extern int write_batch;
+@@ -44,6 +44,7 @@ extern int write_batch;
extern struct stats stats;
extern struct file_list *the_file_list;
extern char *log_format;
/**
-@@ -219,6 +220,26 @@ void send_files(struct file_list *flist,
- : !am_server && log_format_has_i;
+@@ -221,6 +222,26 @@ void send_files(struct file_list *flist,
+ int itemizing = am_server ? logfile_format_has_i : log_format_has_i;
int f_xfer = write_batch < 0 ? batch_fd : f_out;
int i, j;
+ char *filter_argv[MAX_FILTER_ARGS + 1];
if (verbose > 2)
rprintf(FINFO, "send_files starting\n");
-@@ -293,6 +314,7 @@ void send_files(struct file_list *flist,
+@@ -295,6 +316,7 @@ void send_files(struct file_list *flist,
return;
}
fd = do_open(fname, O_RDONLY, 0);
if (fd == -1) {
if (errno == ENOENT) {
-@@ -321,6 +343,33 @@ void send_files(struct file_list *flist,
+@@ -323,6 +345,33 @@ void send_files(struct file_list *flist,
return;
}
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);
-@@ -363,6 +412,8 @@ void send_files(struct file_list *flist,
+@@ -365,6 +414,8 @@ void send_files(struct file_list *flist,
}
}
close(fd);
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff