X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/09bdfcbbd49c10c9e5ecf8998968ad1fc724065b..79bf227ba7ba02e32ac710621b672e2789f9ef50:/unix/uxplink.c

diff --git a/unix/uxplink.c b/unix/uxplink.c
index d069e045..6bf2c858 100644
--- a/unix/uxplink.c
+++ b/unix/uxplink.c
@@ -170,8 +170,6 @@ int from_backend(void *frontend_handle, int is_stderr,
 {
     int osize, esize;
 
-    assert(len > 0);
-
     if (is_stderr) {
 	bufchain_add(&stderr_data, data, len);
 	try_output(1);
@@ -210,6 +208,7 @@ static void usage(void)
     printf("Usage: plink [options] [user@]host [command]\n");
     printf("       (\"host\" can also be a PuTTY saved session name)\n");
     printf("Options:\n");
+    printf("  -V        print version information\n");
     printf("  -v        show verbose messages\n");
     printf("  -load sessname  Load settings from saved session\n");
     printf("  -ssh -telnet -rlogin -raw\n");
@@ -220,11 +219,12 @@ static void usage(void)
     printf("  -batch    disable all interactive prompts\n");
     printf("The following options only apply to SSH connections:\n");
     printf("  -pw passw login with specified password\n");
-    printf("  -D listen-port   Dynamic SOCKS-based port forwarding\n");
-    printf("  -L listen-port:host:port   Forward local port to "
-	   "remote address\n");
-    printf("  -R listen-port:host:port   Forward remote port to"
-	   " local address\n");
+    printf("  -D [listen-IP:]listen-port\n");
+    printf("            Dynamic SOCKS-based port forwarding\n");
+    printf("  -L [listen-IP:]listen-port:host:port\n");
+    printf("            Forward local port to remote address\n");
+    printf("  -R [listen-IP:]listen-port:host:port\n");
+    printf("            Forward remote port to local address\n");
     printf("  -X -x     enable / disable X11 forwarding\n");
     printf("  -A -a     enable / disable agent forwarding\n");
     printf("  -t -T     enable / disable pty allocation\n");
@@ -235,6 +235,12 @@ static void usage(void)
     exit(1);
 }
 
+static void version(void)
+{
+    printf("plink: %s\n", ver);
+    exit(1);
+}
+
 int main(int argc, char **argv)
 {
     int sending;
@@ -302,6 +308,8 @@ int main(int argc, char **argv)
 	    } else if (!strcmp(p, "-s")) {
                 /* Save status to write to cfg later. */
 		use_subsystem = 1;
+	    } else if (!strcmp(p, "-V")) {
+                version();
 	    } else if (!strcmp(p, "-o")) {
                 if (argc <= 1) {
                     fprintf(stderr,
@@ -549,7 +557,7 @@ int main(int argc, char **argv)
 	int nodelay = cfg.tcp_nodelay && isatty(0);
 
 	error = back->init(NULL, &backhandle, &cfg, cfg.host, cfg.port,
-			   &realhost, nodelay);
+			   &realhost, nodelay, cfg.tcp_keepalives);
 	if (error) {
 	    fprintf(stderr, "Unable to open connection:\n%s\n", error);
 	    return 1;