# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1366210123 -28800
# Node ID 34e69908b3f7f12e8655a80583aea798a9ddebcd
# Parent  e0084f136cb88f8530928d85378b1d344d41f789
Use '#' for host#port separator, document it. This fixes scp
in multihop

diff -r e0084f136cb8 -r 34e69908b3f7 cli-runopts.c
--- a/cli-runopts.c	Wed Apr 17 22:29:18 2013 +0800
+++ b/cli-runopts.c	Wed Apr 17 22:48:43 2013 +0800
@@ -610,7 +610,11 @@
 		cli_opts.username = m_strdup(cli_opts.own_user);
 	}
 
-	port = strchr(cli_opts.remotehost, '/');
+	port = strchr(cli_opts.remotehost, '#');
+	if (!port)  {
+		// legacy separator
+		port = strchr(cli_opts.remotehost, '/');
+	}
 	if (port) {
 		*port = '\0';
 		cli_opts.remoteport = port+1;
diff -r e0084f136cb8 -r 34e69908b3f7 dbclient.1
--- a/dbclient.1	Wed Apr 17 22:29:18 2013 +0800
+++ b/dbclient.1	Wed Apr 17 22:48:43 2013 +0800
@@ -15,7 +15,7 @@
 .B dbclient
 [
 .I args ]
-.I [user1]@host1[/port1],[user2]@host2[/port2],...
+.I [user1]@host1[#port1],[user2]@host2[#port2],...
 
 .SH DESCRIPTION
 .B dbclient
@@ -24,10 +24,9 @@
 .SH OPTIONS
 .TP
 .B \-p \fIport
-Remote port.
-Connect to port
+Connect to 
 .I port
-on the remote host.
+on the remote host. Alternatively a port can be specified as hostname#port.
 Default is 22.
 .TP
 .B \-i \fIidfile
@@ -127,7 +126,7 @@
 this case a connection will be made to the first host, then a TCP forwarded 
 connection will be made through that to the second host, and so on. Hosts other than
 the final destination will not see anything other than the encrypted SSH stream. 
-A port for a host can be specified with a slash (eg matt@martello/44 ).
+A port for a host can be specified with a hash (eg matt@martello#44 ).
 This syntax can also be used with scp or rsync (specifying dbclient as the 
 ssh/rsh command). A file can be "bounced" through multiple SSH hops, eg