X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/9621bbab1023b211d1ab0ee2f1039b0462b55812..7d55a379341359e33f193649c4acacb004ffabd3:/unix/uxplink.c

diff --git a/unix/uxplink.c b/unix/uxplink.c
index a9661b54..55d1663d 100644
--- a/unix/uxplink.c
+++ b/unix/uxplink.c
@@ -538,7 +538,7 @@ static void usage(void)
     printf("  -pgpfp    print PGP key fingerprints and exit\n");
     printf("  -v        show verbose messages\n");
     printf("  -load sessname  Load settings from saved session\n");
-    printf("  -ssh -telnet -rlogin -raw\n");
+    printf("  -ssh -telnet -rlogin -raw -serial\n");
     printf("            force use of a particular protocol\n");
     printf("  -P port   connect to specified port\n");
     printf("  -l user   connect with specified username\n");
@@ -587,6 +587,7 @@ int main(int argc, char **argv)
     int exitcode;
     int errors;
     int use_subsystem = 0;
+    int got_host = FALSE;
     void *ldisc;
     long now;
 
@@ -660,7 +661,7 @@ int main(int argc, char **argv)
 		errors = 1;
 	    }
 	} else if (*p) {
-	    if (!cfg_launchable(&cfg)) {
+	    if (!cfg_launchable(&cfg) || !(got_host || loaded_session)) {
 		char *q = p;
 
 		/*
@@ -687,6 +688,7 @@ int main(int argc, char **argv)
 			cfg.port = -1;
 		    strncpy(cfg.host, q, sizeof(cfg.host) - 1);
 		    cfg.host[sizeof(cfg.host) - 1] = '\0';
+		    got_host = TRUE;
 		} else {
 		    char *r, *user, *host;
 		    /*
@@ -735,8 +737,10 @@ int main(int argc, char **argv)
 			    strncpy(cfg.host, host, sizeof(cfg.host) - 1);
 			    cfg.host[sizeof(cfg.host) - 1] = '\0';
 			    cfg.port = default_port;
+			    got_host = TRUE;
 			} else {
 			    cfg = cfg2;
+			    loaded_session = TRUE;
 			}
 		    }
 
@@ -783,7 +787,7 @@ int main(int argc, char **argv)
     if (errors)
 	return 1;
 
-    if (!cfg_launchable(&cfg)) {
+    if (!cfg_launchable(&cfg) || !(got_host || loaded_session)) {
 	usage();
     }