From: Wayne Davison Date: Tue, 9 May 2006 18:31:06 +0000 (+0000) Subject: Some demon_log_* variables changed into logfile_* variables that are X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/ecc7623e7faf75f6ba3dd7b5a416c52e2346ac7d Some demon_log_* variables changed into logfile_* variables that are also used by the new --log-file option. --- diff --git a/clientserver.c b/clientserver.c index 3c89af5f..8c42631e 100644 --- a/clientserver.c +++ b/clientserver.c @@ -39,10 +39,13 @@ extern int protocol_version; extern int io_timeout; extern int no_detach; extern int default_af_hint; +extern int logfile_format_has_i; +extern int logfile_format_has_o_or_i; extern mode_t orig_umask; extern char *bind_address; extern char *sockopts; extern char *config_file; +extern char *logfile_format; extern char *files_from; extern char *tmpdir; extern struct chmod_mode_struct *chmod_modes; @@ -50,8 +53,6 @@ extern struct filter_list_struct server_filter_list; char *auth_user; int read_only = 0; -int daemon_log_format_has_i = 0; -int daemon_log_format_has_o_or_i = 0; int module_id = -1; struct chmod_mode_struct *daemon_chmod_modes; @@ -324,11 +325,12 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host) read_only = 1; if (lp_transfer_logging(i)) { - if (log_format_has(lp_log_format(i), 'i')) - daemon_log_format_has_i = 1; - if (daemon_log_format_has_i - || log_format_has(lp_log_format(i), 'o')) - daemon_log_format_has_o_or_i = 1; + logfile_format = lp_log_format(i); + if (log_format_has(logfile_format, 'i')) + logfile_format_has_i = 1; + if (logfile_format_has_i + || log_format_has(logfile_format, 'o')) + logfile_format_has_o_or_i = 1; } am_root = (MY_UID() == 0); diff --git a/generator.c b/generator.c index c11672f5..e4023d32 100644 --- a/generator.c +++ b/generator.c @@ -27,7 +27,7 @@ extern int verbose; extern int dry_run; extern int do_xfers; extern int log_format_has_i; -extern int daemon_log_format_has_i; +extern int logfile_format_has_i; extern int am_root; extern int am_server; extern int am_daemon; @@ -672,7 +672,7 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx, if (itemizing) itemize(file, ndx, 0, stp, 0, 0, NULL); if (verbose > 1 && maybe_ATTRS_REPORT) { - code = daemon_log_format_has_i || dry_run + code = logfile_format_has_i || dry_run ? FCLIENT : FINFO; rprintf(code, "%s is uptodate\n", fname); } @@ -694,7 +694,7 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx, if (maybe_ATTRS_REPORT && ((!itemizing && verbose && match_level == 2) || (verbose > 1 && match_level == 3))) { - code = daemon_log_format_has_i || dry_run + code = logfile_format_has_i || dry_run ? FCLIENT : FINFO; rprintf(code, "%s%s\n", fname, match_level == 3 ? " is uptodate" : ""); @@ -770,7 +770,7 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx, itemize(file, ndx, 0, &st, changes, 0, lp); } if (verbose > 1 && maybe_ATTRS_REPORT) { - code = daemon_log_format_has_i || dry_run + code = logfile_format_has_i || dry_run ? FCLIENT : FINFO; rprintf(code, "%s is uptodate\n", fname); } @@ -1339,9 +1339,9 @@ void generate_files(int f_out, struct file_list *flist, char *local_name) if (protocol_version >= 29) { itemizing = 1; maybe_ATTRS_REPORT = log_format_has_i ? 0 : ATTRS_REPORT; - code = daemon_log_format_has_i ? 0 : FLOG; + code = logfile_format_has_i ? 0 : FLOG; } else if (am_daemon) { - itemizing = daemon_log_format_has_i && do_xfers; + itemizing = logfile_format_has_i && do_xfers; maybe_ATTRS_REPORT = ATTRS_REPORT; code = itemizing || !do_xfers ? FCLIENT : FINFO; } else if (!am_server) { diff --git a/receiver.c b/receiver.c index b6215fb3..94b6fb40 100644 --- a/receiver.c +++ b/receiver.c @@ -24,12 +24,11 @@ extern int verbose; extern int do_xfers; -extern int am_daemon; extern int am_server; extern int do_progress; extern int log_before_transfer; extern int log_format_has_i; -extern int daemon_log_format_has_i; +extern int logfile_format_has_i; extern int csum_length; extern int read_batch; extern int write_batch; @@ -343,8 +342,7 @@ int recv_files(int f_in, struct file_list *flist, char *local_name) struct file_struct *file; struct stats initial_stats; int save_make_backups = make_backups; - int itemizing = am_daemon ? daemon_log_format_has_i - : !am_server && log_format_has_i; + int itemizing = am_server ? logfile_format_has_i : log_format_has_i; int max_phase = protocol_version >= 29 ? 2 : 1; int i, recv_ok; diff --git a/rsync.c b/rsync.c index 3eed2957..818f26b4 100644 --- a/rsync.c +++ b/rsync.c @@ -32,7 +32,7 @@ extern int verbose; extern int dry_run; -extern int daemon_log_format_has_i; +extern int logfile_format_has_i; extern int preserve_perms; extern int preserve_executability; extern int preserve_times; @@ -218,7 +218,7 @@ int set_file_attrs(char *fname, struct file_struct *file, STRUCT_STAT *st, #endif if (verbose > 1 && flags & ATTRS_REPORT) { - enum logcode code = daemon_log_format_has_i || dry_run + enum logcode code = logfile_format_has_i || dry_run ? FCLIENT : FINFO; if (updated) rprintf(code, "%s\n", fname); diff --git a/sender.c b/sender.c index db7974c3..3a8ec7fa 100644 --- a/sender.c +++ b/sender.c @@ -28,7 +28,7 @@ extern int am_server; extern int am_daemon; extern int log_before_transfer; extern int log_format_has_i; -extern int daemon_log_format_has_i; +extern int logfile_format_has_i; extern int csum_length; extern int append_mode; extern int io_error; @@ -218,8 +218,7 @@ void send_files(struct file_list *flist, int f_out, int f_in) int phase = 0, max_phase = protocol_version >= 29 ? 2 : 1; struct stats initial_stats; int save_make_backups = make_backups; - int itemizing = am_daemon ? daemon_log_format_has_i - : !am_server && log_format_has_i; + 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;