Matt McCutchen's Web Site
/
rsync
/
rsync-patches.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adding --chown=USER:GROUP alias for simple usecases of the
[rsync/rsync-patches.git]
/
log-checksum.diff
diff --git
a/log-checksum.diff
b/log-checksum.diff
index
b7ab815
..
bbdf55a
100644
(file)
--- a/
log-checksum.diff
+++ b/
log-checksum.diff
@@
-118,7
+118,7
@@
diff --git a/main.c b/main.c
extern int remove_source_files;
extern int need_messages_from_generator;
extern int kluge_around_eof;
extern int remove_source_files;
extern int need_messages_from_generator;
extern int kluge_around_eof;
-@@ -
71,6 +72,8 @@ extern int check_for_io_err
;
+@@ -
68,6 +69,8 @@ extern int connect_timeout
;
extern pid_t cleanup_child_pid;
extern unsigned int module_dirlen;
extern struct stats stats;
extern pid_t cleanup_child_pid;
extern unsigned int module_dirlen;
extern struct stats stats;
@@
-127,7
+127,7
@@
diff --git a/main.c b/main.c
extern char *filesfrom_host;
extern char *partial_dir;
extern char *dest_option;
extern char *filesfrom_host;
extern char *partial_dir;
extern char *dest_option;
-@@ -8
8,6 +91
,7 @@ int local_server = 0;
+@@ -8
5,6 +88
,7 @@ int local_server = 0;
int daemon_over_rsh = 0;
mode_t orig_umask = 0;
int batch_gen_fd = -1;
int daemon_over_rsh = 0;
mode_t orig_umask = 0;
int batch_gen_fd = -1;
@@
-135,7
+135,7
@@
diff --git a/main.c b/main.c
/* There's probably never more than at most 2 outstanding child processes,
* but set it higher, just in case. */
/* There's probably never more than at most 2 outstanding child processes,
* but set it higher, just in case. */
-@@ -100
8,6 +1012
,12 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
+@@ -100
3,6 +1007
,12 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
if (am_sender) {
keep_dirlinks = 0; /* Must be disabled on the sender. */
if (am_sender) {
keep_dirlinks = 0; /* Must be disabled on the sender. */