X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/ff2ae36762dccc463baba86bf9d39de1a57a70e1..7d2c1789c5a8ccf8a767fb11082bff34c1b7c5aa:/plink.c

diff --git a/plink.c b/plink.c
index 047414ad..a76570ee 100644
--- a/plink.c
+++ b/plink.c
@@ -8,6 +8,7 @@
 #include <windows.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <assert.h>
 #include <stdarg.h>
 
 #define PUTTY_DO_GLOBALS	       /* actually _define_ globals */
@@ -26,7 +27,7 @@ void fatalbox(char *p, ...)
     va_end(ap);
     fputc('\n', stderr);
     WSACleanup();
-    exit(1);
+    cleanup_exit(1);
 }
 void connection_fatal(char *p, ...)
 {
@@ -37,7 +38,7 @@ void connection_fatal(char *p, ...)
     va_end(ap);
     fputc('\n', stderr);
     WSACleanup();
-    exit(1);
+    cleanup_exit(1);
 }
 
 static char *password = NULL;
@@ -147,6 +148,8 @@ int from_backend(int is_stderr, char *data, int len)
     HANDLE h = (is_stderr ? errhandle : outhandle);
     int osize, esize;
 
+    assert(len > 0);
+
     if (is_stderr) {
 	bufchain_add(&stderr_data, data, len);
 	try_output(1);
@@ -422,25 +425,32 @@ int main(int argc, char **argv)
 		    }
 		}
 	    } else {
-		int len = sizeof(cfg.remote_cmd) - 1;
-		char *cp = cfg.remote_cmd;
-		int len2;
-
-		strncpy(cp, p, len);
-		cp[len] = '\0';
-		len2 = strlen(cp);
-		len -= len2;
-		cp += len2;
-		while (--argc) {
-		    if (len > 0)
-			len--, *cp++ = ' ';
-		    strncpy(cp, *++argv, len);
-		    cp[len] = '\0';
-		    len2 = strlen(cp);
-		    len -= len2;
-		    cp += len2;
+		char *command;
+		int cmdlen, cmdsize;
+		cmdlen = cmdsize = 0;
+		command = NULL;
+
+		while (argc) {
+		    while (*p) {
+			if (cmdlen >= cmdsize) {
+			    cmdsize = cmdlen + 512;
+			    command = srealloc(command, cmdsize);
+			}
+			command[cmdlen++]=*p++;
+		    }
+		    if (cmdlen >= cmdsize) {
+			cmdsize = cmdlen + 512;
+			command = srealloc(command, cmdsize);
+		    }
+		    command[cmdlen++]=' '; /* always add trailing space */
+		    if (--argc) p = *++argv;
 		}
+		if (cmdlen) command[--cmdlen]='\0';
+				       /* change trailing blank to NUL */
+		cfg.remote_cmd_ptr = command;
+		cfg.remote_cmd_ptr2 = NULL;
 		cfg.nopty = TRUE;      /* command => no terminal */
+
 		break;		       /* done with cmdline */
 	    }
 	}
@@ -597,7 +607,7 @@ int main(int argc, char **argv)
     if (!CreateThread(NULL, 0, stdout_write_thread,
 		      &odata, 0, &out_threadid)) {
 	fprintf(stderr, "Unable to create output thread\n");
-	exit(1);
+	cleanup_exit(1);
     }
     edata.event = stderrevent;
     edata.eventback = CreateEvent(NULL, FALSE, FALSE, NULL);
@@ -606,7 +616,7 @@ int main(int argc, char **argv)
     if (!CreateThread(NULL, 0, stdout_write_thread,
 		      &edata, 0, &err_threadid)) {
 	fprintf(stderr, "Unable to create error output thread\n");
-	exit(1);
+	cleanup_exit(1);
     }
 
     while (1) {
@@ -634,7 +644,7 @@ int main(int argc, char **argv)
 	    if (!CreateThread(NULL, 0, stdin_read_thread,
 			      &idata, 0, &in_threadid)) {
 		fprintf(stderr, "Unable to create input thread\n");
-		exit(1);
+		cleanup_exit(1);
 	    }
 	    sending = TRUE;
 	}
@@ -679,21 +689,26 @@ int main(int argc, char **argv)
 		socket = sklist[i];
 		wp = (WPARAM) socket;
 		if (!WSAEnumNetworkEvents(socket, NULL, &things)) {
+                    static const struct { int bit, mask; } eventtypes[] = {
+                        {FD_CONNECT_BIT, FD_CONNECT},
+                        {FD_READ_BIT, FD_READ},
+                        {FD_CLOSE_BIT, FD_CLOSE},
+                        {FD_OOB_BIT, FD_OOB},
+                        {FD_WRITE_BIT, FD_WRITE},
+                        {FD_ACCEPT_BIT, FD_ACCEPT},
+                    };
+                    int e;
+
 		    noise_ultralight(socket);
 		    noise_ultralight(things.lNetworkEvents);
-		    if (things.lNetworkEvents & FD_CONNECT)
-			connopen &= select_result(wp, (LPARAM) FD_CONNECT);
-		    if (things.lNetworkEvents & FD_READ)
-			connopen &= select_result(wp, (LPARAM) FD_READ);
-		    if (things.lNetworkEvents & FD_CLOSE)
-			connopen &= select_result(wp, (LPARAM) FD_CLOSE);
-		    if (things.lNetworkEvents & FD_OOB)
-			connopen &= select_result(wp, (LPARAM) FD_OOB);
-		    if (things.lNetworkEvents & FD_WRITE)
-			connopen &= select_result(wp, (LPARAM) FD_WRITE);
-    		    if (things.lNetworkEvents & FD_ACCEPT)
-			connopen &= select_result(wp, (LPARAM) FD_ACCEPT);
 
+                    for (e = 0; e < lenof(eventtypes); e++)
+                        if (things.lNetworkEvents & eventtypes[e].mask) {
+                            LPARAM lp;
+                            int err = things.iErrorCode[eventtypes[e].bit];
+                            lp = WSAMAKESELECTREPLY(eventtypes[e].mask, err);
+                            connopen &= select_result(wp, lp);
+                        }
 		}
 	    }
 	} else if (n == 1) {
@@ -710,7 +725,7 @@ int main(int argc, char **argv)
 	    odata.busy = 0;
 	    if (!odata.writeret) {
 		fprintf(stderr, "Unable to write to standard output\n");
-		exit(0);
+		cleanup_exit(0);
 	    }
 	    bufchain_consume(&stdout_data, odata.lenwritten);
 	    if (bufchain_size(&stdout_data) > 0)
@@ -723,7 +738,7 @@ int main(int argc, char **argv)
 	    edata.busy = 0;
 	    if (!edata.writeret) {
 		fprintf(stderr, "Unable to write to standard output\n");
-		exit(0);
+		cleanup_exit(0);
 	    }
 	    bufchain_consume(&stderr_data, edata.lenwritten);
 	    if (bufchain_size(&stderr_data) > 0)