We only need to send --stats to a remote receiver now.

[rsync/rsync.git] / options.c

diff --git a/options.c b/options.c
index 0c64eaa..5f8018f 100644 (file)
--- a/options.c
+++ b/options.c
@@ -2368,9 +2368,6 @@ void server_options(char **args, int *argc_p)
        if (protect_args && !local_server) /* unprotected args stop here */
                args[ac++] = NULL;
 
-       if (do_stats)
-               args[ac++] = "--stats";
-
        if (list_only > 1)
                args[ac++] = "--list-only";
 
@@ -2472,6 +2469,8 @@ void server_options(char **args, int *argc_p)
                        args[ac++] = "--super";
                if (size_only)
                        args[ac++] = "--size-only";
+               if (do_stats)
+                       args[ac++] = "--stats";
        } else {
                if (skip_compress) {
                        if (asprintf(&arg, "--skip-compress=%s", skip_compress) < 0)
@@ -2626,17 +2625,18 @@ void server_options(char **args, int *argc_p)
  * (required for parsing) [ and ] chars elided from the returned string. */
 static char *parse_hostspec(char *str, char **path_start_ptr, int *port_ptr)
 {
-       char *s = str;
-       char *host_start = str;
+       char *s, *host_start = str;
        int hostlen = 0, userlen = 0;
        char *ret;
 
-       for ( ; ; s++) {
+       for (s = str; ; s++) {
                if (!*s) {
                        /* It is only OK if we run out of string with rsync:// */
-                       if (port_ptr)
-                               break;
-                       return NULL;
+                       if (!port_ptr)
+                               return NULL;
+                       if (!hostlen)
+                               hostlen = s - host_start;
+                       break;
                }
                if (*s == ':' || *s == '/') {
                        if (!hostlen)
@@ -2647,7 +2647,7 @@ static char *parse_hostspec(char *str, char **path_start_ptr, int *port_ptr)
                        } else if (port_ptr) {
                                *port_ptr = atoi(s);
                                while (isDigit(s)) s++;
-                               if (*s++ != '/')
+                               if (*s && *s++ != '/')
                                        return NULL;
                        }
                        break;