Improved the handling of --msgs2stderr a little more.

[rsync/rsync.git] / clientserver.c

diff --git a/clientserver.c b/clientserver.c
index 39a8ced..2ba7dbd 100644 (file)
--- a/clientserver.c
+++ b/clientserver.c
@@ -23,7 +23,6 @@
 #include "ifuncs.h"
 
 extern int quiet;
-extern int verbose;
 extern int dry_run;
 extern int output_motd;
 extern int list_only;
@@ -121,8 +120,6 @@ int start_socket_client(char *host, int remote_argc, char *remote_argv[],
        if (fd == -1)
                exit_cleanup(RERR_SOCKETIO);
 
-       set_socket_options(fd, sockopts);
-
 #ifdef ICONV_CONST
        setup_iconv();
 #endif
@@ -269,7 +266,7 @@ int start_inband_exchange(int f_in, int f_out, const char *user, int argc, char
 
        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);
@@ -509,15 +506,15 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
                        out_of_memory("rsync_module");
        }
 
-       /* We do a push_dir() that doesn't actually call chdir()
+       /* We do a change_dir() that doesn't actually call chdir()
         * just to make a relative path absolute. */
        strlcpy(line, curr_dir, sizeof line);
-       if (!push_dir(module_dir, 1))
+       if (!change_dir(module_dir, CD_SKIP_CHDIR))
                goto chdir_failed;
        if (strcmp(curr_dir, module_dir) != 0
         && (module_dir = strdup(curr_dir)) == NULL)
                out_of_memory("rsync_module");
-       push_dir(line, 1); /* Restore curr_dir. */
+       change_dir(line, CD_SKIP_CHDIR); /* Restore curr_dir. */
 
        if (use_chroot) {
                chroot_path = module_dir;
@@ -673,12 +670,12 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
                        io_printf(f_out, "@ERROR: chroot failed\n");
                        return -1;
                }
-               if (!push_dir(module_dir, 0))
+               if (!change_dir(module_dir, CD_NORMAL))
                        goto chdir_failed;
                if (module_dirlen)
                        sanitize_paths = 1;
        } else {
-               if (!push_dir(module_dir, 0)) {
+               if (!change_dir(module_dir, CD_NORMAL)) {
                  chdir_failed:
                        rsyserr(FLOG, errno, "chdir %s failed\n", module_dir);
                        io_printf(f_out, "@ERROR: chdir failed\n");
@@ -749,7 +746,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;
 
-       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;
@@ -800,8 +797,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 */
-       if (verbose > lp_max_verbosity(i))
-               verbose = lp_max_verbosity(i);
+       limit_output_verbosity(lp_max_verbosity(i));
 #endif
 
        if (protocol_version < 23
@@ -931,10 +927,6 @@ int start_daemon(int f_in, int f_out)
 
        if (!am_server) {
                set_socket_options(f_in, "SO_KEEPALIVE");
-               if (sockopts)
-                       set_socket_options(f_in, sockopts);
-               else
-                       set_socket_options(f_in, lp_socket_options());
                set_nonblocking(f_in);
        }