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
Change the references to "service" to be either "section" or "module".
[rsync/rsync.git]
/
clientserver.c
diff --git
a/clientserver.c
b/clientserver.c
index
f78c61c
..
6fce7c4
100644
(file)
--- a/
clientserver.c
+++ b/
clientserver.c
@@
-23,7
+23,6
@@
#include "ifuncs.h"
extern int quiet;
#include "ifuncs.h"
extern int quiet;
-extern int verbose;
extern int dry_run;
extern int output_motd;
extern int list_only;
extern int dry_run;
extern int output_motd;
extern int list_only;
@@
-50,14
+49,13
@@
extern int logfile_format_has_i;
extern int logfile_format_has_o_or_i;
extern mode_t orig_umask;
extern char *bind_address;
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;
extern struct filter_list_struct daemon_filter_list;
extern char *config_file;
extern char *logfile_format;
extern char *files_from;
extern char *tmpdir;
extern struct chmod_mode_struct *chmod_modes;
extern struct filter_list_struct daemon_filter_list;
-extern char curr_dir[];
+extern char curr_dir[
MAXPATHLEN
];
#ifdef ICONV_OPTION
extern char *iconv_opt;
extern iconv_t ic_send, ic_recv;
#ifdef ICONV_OPTION
extern char *iconv_opt;
extern iconv_t ic_send, ic_recv;
@@
-267,7
+265,7
@@
int start_inband_exchange(int f_in, int f_out, const char *user, int argc, char
sargs[sargc] = NULL;
sargs[sargc] = NULL;
- if (
verbose > 1
)
+ if (
DEBUG_GTE(CMD, 1)
)
print_child_argv("sending daemon args:", sargs);
io_printf(f_out, "%.*s\n", modlen, modname);
print_child_argv("sending daemon args:", sargs);
io_printf(f_out, "%.*s\n", modlen, modname);
@@
-747,7
+745,7
@@
static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
read_args(f_in, name, line, sizeof line, rl_nulls, &argv, &argc, &request);
orig_argv = argv;
read_args(f_in, name, line, sizeof line, rl_nulls, &argv, &argc, &request);
orig_argv = argv;
-
verbose = 0
; /* future verbosity is controlled by client options */
+
reset_output_levels()
; /* future verbosity is controlled by client options */
ret = parse_arguments(&argc, (const char ***) &argv);
if (protect_args && ret) {
orig_early_argv = orig_argv;
ret = parse_arguments(&argc, (const char ***) &argv);
if (protect_args && ret) {
orig_early_argv = orig_argv;
@@
-798,8
+796,7
@@
static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
#ifndef DEBUG
/* don't allow the logs to be flooded too fast */
#ifndef DEBUG
/* don't allow the logs to be flooded too fast */
- if (verbose > lp_max_verbosity(i))
- verbose = lp_max_verbosity(i);
+ limit_output_verbosity(lp_max_verbosity(i));
#endif
if (protocol_version < 23
#endif
if (protocol_version < 23
@@
-882,7
+879,7
@@
static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
with "list = False". */
static void send_listing(int fd)
{
with "list = False". */
static void send_listing(int fd)
{
- int n = lp_num
servic
es();
+ int n = lp_num
_modul
es();
int i;
for (i = 0; i < n; i++) {
int i;
for (i = 0; i < n; i++) {