Moved (and expanded) a verbose message from clientserver.c to socket.c

[rsync/rsync.git] / clientserver.c

diff --git a/clientserver.c b/clientserver.c
index f96d5e6..6c2e6d9 100644 (file)
--- a/clientserver.c
+++ b/clientserver.c
@@ -87,18 +87,10 @@ int start_socket_client(char *host, char *path, int argc, char *argv[])
                *p = 0;
        }
 
-       if (verbose >= 2) {
-               /* FIXME: If we're going to use a socket program for
-                * testing, then this message is wrong.  We need to
-                * say something like "(except really using %s)" */
-               rprintf(FINFO, "opening tcp connection to %s port %d\n",
-                       host, rsync_port);
-       }
        fd = open_socket_out_wrapped(host, rsync_port, bind_address,
                                     default_af_hint);
-       if (fd == -1) {
+       if (fd == -1)
                exit_cleanup(RERR_SOCKETIO);
-       }
 
        ret = start_inband_exchange(user, path, fd, fd, argc);
 
@@ -302,16 +294,19 @@ static int rsync_module(int f_in, int f_out, int i)
                exclude_path_prefix = "";
 
        p = lp_include_from(i);
-       add_exclude_file(&server_exclude_list, p, MISSING_FATAL, ADD_INCLUDE);
+       add_exclude_file(&server_exclude_list, p,
+                        XFLG_FATAL_ERRORS | XFLG_DEF_INCLUDE);
 
        p = lp_include(i);
-       add_exclude_line(&server_exclude_list, p, ADD_INCLUDE);
+       add_exclude(&server_exclude_list, p,
+                   XFLG_WORD_SPLIT | XFLG_DEF_INCLUDE);
 
        p = lp_exclude_from(i);
-       add_exclude_file(&server_exclude_list, p, MISSING_FATAL, ADD_EXCLUDE);
+       add_exclude_file(&server_exclude_list, p,
+                        XFLG_FATAL_ERRORS);
 
        p = lp_exclude(i);
-       add_exclude_line(&server_exclude_list, p, ADD_EXCLUDE);
+       add_exclude(&server_exclude_list, p, XFLG_WORD_SPLIT);
 
        exclude_path_prefix = NULL;