Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed typo in rsyncd exclude handling
[rsync/rsync.git]
/
main.c
diff --git
a/main.c
b/main.c
index
b4c514f
..
f914f3e
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-32,9
+32,16
@@
static void report(int f)
time_t t = time(NULL);
extern int am_server;
extern int am_sender;
time_t t = time(NULL);
extern int am_server;
extern int am_sender;
+ extern int am_daemon;
if (!verbose) return;
if (!verbose) return;
+ if (am_daemon) {
+ rprintf(FINFO, "wrote %.0f bytes read %.0f bytes total size %.0f\n",
+ (double)write_total(),(double)read_total(),
+ (double)total_size);
+ }
+
if (am_server && am_sender) {
write_longint(f,read_total());
write_longint(f,write_total());
if (am_server && am_sender) {
write_longint(f,read_total());
write_longint(f,write_total());
@@
-204,18
+211,6
@@
static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
argv[i] += l+1;
}
argv[i] += l+1;
}
- if (am_daemon) {
- extern int module_id;
- char *name = lp_name(module_id);
- int l = strlen(name);
- for (i=0;i<argc;i++) {
- if (strncmp(argv[i], name, l) == 0) {
- argv[i] += l;
- if (!*argv[i]) argv[i] = ".";
- }
- }
- }
-
if (argc == 0 && recurse) {
argc=1;
argv--;
if (argc == 0 && recurse) {
argc=1;
argv--;
@@
-272,18
+267,6
@@
static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
if (verbose > 2)
rprintf(FINFO,"server_recv(%d) starting pid=%d\n",argc,(int)getpid());
if (verbose > 2)
rprintf(FINFO,"server_recv(%d) starting pid=%d\n",argc,(int)getpid());
- if (am_daemon) {
- extern int module_id;
- char *name = lp_name(module_id);
- int i, l = strlen(name);
- for (i=0;i<argc;i++) {
- if (strncmp(argv[i], name, l) == 0) {
- argv[i] += l;
- if (!*argv[i]) argv[i] = ".";
- }
- }
- }
-
if (argc > 0) {
dir = argv[0];
argc--;
if (argc > 0) {
dir = argv[0];
argc--;