parsing ports in the hosts file now too

2 files changed, 13 insertions, 4 deletions

diff --git a/src/cssh.c b/src/cssh.c
index 88a3dd7..e5a01c4 100644
--- a/src/cssh.c
+++ b/src/cssh.c
@@ -248,10 +248,16 @@ static int read_hosts_file( const char *hosts_file, unsigned short default_port,
 		if( strlen( buf ) > 0 && buf[strlen( buf )-1] == '\n' ) {
 			buf[strlen(buf)-1] = '\0';
 		}
+		// the user can be part of the hostname, libssh allows this,
+		// but we must parse the port separately
+		char *p = strchr( buf, ':' );
+		if( p != NULL ) {
+			(*port)[*nof_hosts] = atoi( p+1 );
+			*p = '\0';
+		} else { 
+			(*port)[*nof_hosts] = default_port;
+		}
 		(*host)[*nof_hosts] = strdup( buf );
-		// TODO: parse port from file
-		// TODO: parse user from file (but actually we can use the user@host hack in libssh)
-		(*port)[*nof_hosts] = default_port;
 		(*nof_hosts)++;
 		if( *nof_hosts > size_hosts ) {
 			size_hosts *= 2;
diff --git a/src/options.ggo.in b/src/options.ggo.in
index 9f70ca4..c667572 100644
--- a/src/options.ggo.in
+++ b/src/options.ggo.in
@@ -23,7 +23,10 @@ section "Main Options"
 		optional
 		
 	option "hosts-file" H
-		"List of hosts to use in parallel (listed one per line in a file), optional second parameter separated with a tab can be the port"
+		"List of hosts to use in parallel \
+(listed one per line in a file), optionally \
+you can specify a port immediatelly after a colon \
+after the hostname. Example 'user@host:port'"
 		string typestr="hosts-file"
 		optional