Beginning work on a 3.0.6 release.

[rsync/rsync.git] / options.c

diff --git a/options.c b/options.c
index aebfdf8..90c0b91 100644 (file)
--- a/options.c
+++ b/options.c
@@ -228,7 +228,8 @@ static void print_rsync_version(enum logcode f)
        STRUCT_STAT *dumstat;
 
 #if SUBPROTOCOL_VERSION != 0
-       asprintf(&subprotocol, ".PR%d", SUBPROTOCOL_VERSION);
+       if (asprintf(&subprotocol, ".PR%d", SUBPROTOCOL_VERSION) < 0)
+               out_of_memory("print_rsync_version");
 #endif
 #ifdef HAVE_SOCKETPAIR
        got_socketpair = "";
@@ -1840,7 +1841,8 @@ void server_options(char **args, int *argc_p)
 
        argstr[x] = '\0';
 
-       args[ac++] = argstr;
+       if (x > 1)
+               args[ac++] = argstr;
 
 #ifdef ICONV_OPTION
        if (iconv_opt) {