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
If the user specifies --log-file-format without --log-file,
[rsync/rsync.git]
/
options.c
diff --git
a/options.c
b/options.c
index
60a72fd
..
1727d4b
100644
(file)
--- a/
options.c
+++ b/
options.c
@@
-1321,7
+1321,8
@@
int parse_arguments(int *argc, const char ***argv, int frommain)
logfile_format_has_o_or_i = 1;
}
log_init();
logfile_format_has_o_or_i = 1;
}
log_init();
- }
+ } else if (!am_daemon)
+ logfile_format = NULL;
if (daemon_bwlimit && (!bwlimit || bwlimit > daemon_bwlimit))
bwlimit = daemon_bwlimit;
if (daemon_bwlimit && (!bwlimit || bwlimit > daemon_bwlimit))
bwlimit = daemon_bwlimit;