X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/305666bf59c50788fd31054e404d26df79ddf0c4..ef20efcbb69274e423321d7ac27bfe868bca65aa:/options.c

diff --git a/options.c b/options.c
index ea35841a..be7ed1fd 100644
--- a/options.c
+++ b/options.c
@@ -145,6 +145,7 @@ int rsync_port = 0;
 int compare_dest = 0;
 int link_dest = 0;
 int basis_dir_cnt = 0;
+char *dest_option = NULL;
 
 int verbose = 0;
 int quiet = 0;
@@ -163,7 +164,6 @@ static int F_option_cnt = 0;
 static int modify_window_set;
 static int refused_delete, refused_archive_part;
 static int refused_partial, refused_progress, refused_delete_before;
-static char *dest_option = NULL;
 static char *max_size_arg;
 static char partialdir_for_delayupdate[] = ".~tmp~";
 
@@ -292,7 +292,7 @@ void usage(enum logcode F)
   rprintf(F," -x, --one-file-system       don't cross filesystem boundaries\n");
   rprintf(F," -B, --block-size=SIZE       force a fixed checksum block-size\n");
   rprintf(F," -e, --rsh=COMMAND           specify the remote shell to use\n");
-  rprintf(F,"     --rsync-path=PATH       specify path to rsync on the remote machine\n");
+  rprintf(F,"     --rsync-path=PROGRAM    specify the rsync to run on the remote machine\n");
   rprintf(F,"     --existing              only update files that already exist on receiver\n");
   rprintf(F,"     --ignore-existing       ignore files that already exist on receiving side\n");
   rprintf(F,"     --remove-sent-files     sent files/symlinks are removed from sending side\n");
@@ -1490,17 +1490,16 @@ char *check_for_hostspec(char *s, char **host_ptr, int *port_ptr)
 		if (*s == '[' && (p = strchr(s, ']')) != NULL) {
 			s++;
 			hostlen = p - s;
-			if (*p == ':')
-				*port_ptr = atoi(p+1);
-			else if (!*port_ptr)
-				*port_ptr = RSYNC_PORT;
+			if (p[1] == ':')
+				*port_ptr = atoi(p+2);
 		} else {
 			if ((p = strchr(s, ':')) != NULL) {
 				hostlen = p - s;
 				*port_ptr = atoi(p+1);
-			} else if (!*port_ptr)
-				*port_ptr = RSYNC_PORT;
+			}
 		}
+		if (!*port_ptr)
+			*port_ptr = RSYNC_PORT;
 		*host_ptr = new_array(char, hostlen + 1);
 		strlcpy(*host_ptr, s, hostlen + 1);
 		return path;
@@ -1513,6 +1512,7 @@ char *check_for_hostspec(char *s, char **host_ptr, int *port_ptr)
 		*p = ']';
 		if (not_host)
 			return NULL;
+		p++;
 	} else {
 		if (!(p = strchr(s, ':')))
 			return NULL;