Matt McCutchen's Web Site
/
rsync
/
rsync-patches.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3fcc541
)
Fixed a build problem with the last change.
author
Wayne Davison
<wayned@samba.org>
Fri, 21 Apr 2006 02:56:35 +0000
(
02:56
+0000)
committer
Wayne Davison
<wayned@samba.org>
Fri, 21 Apr 2006 02:56:35 +0000
(
02:56
+0000)
log-file.diff
patch
|
blob
|
blame
|
history
diff --git
a/log-file.diff
b/log-file.diff
index
7bfc8bc
..
f86ec96
100644
(file)
--- a/
log-file.diff
+++ b/
log-file.diff
@@
-3,11
+3,12
@@
are doing, similar to how a daemon logs its actions.
--- old/cleanup.c
+++ new/cleanup.c
--- old/cleanup.c
+++ new/cleanup.c
-@@ -21,10 +21,1
2
@@
+@@ -21,10 +21,1
3
@@
#include "rsync.h"
+extern int am_server;
#include "rsync.h"
+extern int am_server;
++extern int am_daemon;
extern int io_error;
extern int keep_partial;
extern int log_got_error;
extern int io_error;
extern int keep_partial;
extern int log_got_error;
@@
-16,7
+17,7
@@
are doing, similar to how a daemon logs its actions.
#ifdef HAVE_SIGACTION
static struct sigaction sigact;
#ifdef HAVE_SIGACTION
static struct sigaction sigact;
-@@ -149,7 +15
1
,7 @@ void _exit_cleanup(int code, const char
+@@ -149,7 +15
2
,7 @@ void _exit_cleanup(int code, const char
code = RERR_PARTIAL;
}
code = RERR_PARTIAL;
}
@@
-144,7
+145,7
@@
are doing, similar to how a daemon logs its actions.
? FCLIENT : FINFO;
rprintf(code, "%s%s\n", fname,
match_level == 3 ? " is uptodate" : "");
? FCLIENT : FINFO;
rprintf(code, "%s%s\n", fname,
match_level == 3 ? " is uptodate" : "");
-@@ -7
46,7 +746
,7 @@ static int try_dests_non(struct file_str
+@@ -7
58,7 +758
,7 @@ static int try_dests_non(struct file_str
itemize(file, ndx, 0, &st, changes, 0, lp);
}
if (verbose > 1 && maybe_ATTRS_REPORT) {
itemize(file, ndx, 0, &st, changes, 0, lp);
}
if (verbose > 1 && maybe_ATTRS_REPORT) {
@@
-153,7
+154,7
@@
are doing, similar to how a daemon logs its actions.
? FCLIENT : FINFO;
rprintf(code, "%s is uptodate\n", fname);
}
? FCLIENT : FINFO;
rprintf(code, "%s is uptodate\n", fname);
}
-@@ -13
09,9 +1309
,9 @@ void generate_files(int f_out, struct fi
+@@ -13
27,9 +1327
,9 @@ void generate_files(int f_out, struct fi
if (protocol_version >= 29) {
itemizing = 1;
maybe_ATTRS_REPORT = log_format_has_i ? 0 : ATTRS_REPORT;
if (protocol_version >= 29) {
itemizing = 1;
maybe_ATTRS_REPORT = log_format_has_i ? 0 : ATTRS_REPORT;
@@
-491,7
+492,7
@@
are doing, similar to how a daemon logs its actions.
--log-format=FORMAT output filenames using the specified format
--password-file=FILE read password from FILE
--list-only list the files instead of copying them
--log-format=FORMAT output filenames using the specified format
--password-file=FILE read password from FILE
--list-only list the files instead of copying them
-@@ -14
23,6 +1424
,23 @@ the string "*deleting" for each item tha
+@@ -14
30,6 +1431
,23 @@ the string "*deleting" for each item tha
you are talking to a recent enough rsync that it logs deletions instead of
outputting them as a verbose message).
you are talking to a recent enough rsync that it logs deletions instead of
outputting them as a verbose message).