X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/cae0c0233cb7c0180bfb7a5bca934b6e57805471..b7a189f38294c745ae4ea6efb55891c8196e275b:/plink.c

diff --git a/plink.c b/plink.c
index 589de1a0..63d30c42 100644
--- a/plink.c
+++ b/plink.c
@@ -40,7 +40,7 @@ void modalfatalbox(char *p, ...)
     WSACleanup();
     cleanup_exit(1);
 }
-void connection_fatal(char *p, ...)
+void connection_fatal(void *frontend, char *p, ...)
 {
     va_list ap;
     fprintf(stderr, "FATAL ERROR: ");
@@ -62,18 +62,19 @@ void cmdline_error(char *p, ...)
     exit(1);
 }
 
-static char *password = NULL;
-
 HANDLE inhandle, outhandle, errhandle;
 DWORD orig_console_mode;
 
 WSAEVENT netevent;
 
-int term_ldisc(int mode)
+static Backend *back;
+static void *backhandle;
+
+int term_ldisc(Terminal *term, int mode)
 {
     return FALSE;
 }
-void ldisc_update(int echo, int edit)
+void ldisc_update(void *frontend, int echo, int edit)
 {
     /* Update stdin read mode to reflect changes in line discipline. */
     DWORD mode;
@@ -164,9 +165,8 @@ void try_output(int is_stderr)
     }
 }
 
-int from_backend(int is_stderr, char *data, int len)
+int from_backend(void *frontend_handle, int is_stderr, char *data, int len)
 {
-    HANDLE h = (is_stderr ? errhandle : outhandle);
     int osize, esize;
 
     assert(len > 0);
@@ -253,6 +253,7 @@ int main(int argc, char **argv)
     int skcount, sksize;
     int connopen;
     int exitcode;
+    int errors;
 
     ssh_get_line = console_get_line;
 
@@ -272,6 +273,7 @@ int main(int argc, char **argv)
     do_defaults(NULL, &cfg);
     default_protocol = cfg.protocol;
     default_port = cfg.port;
+    errors = 0;
     {
 	/*
 	 * Override the default protocol if PLINK_PROTOCOL is set.
@@ -296,12 +298,16 @@ int main(int argc, char **argv)
 	    if (ret == -2) {
 		fprintf(stderr,
 			"plink: option \"%s\" requires an argument\n", p);
+		errors = 1;
 	    } else if (ret == 2) {
 		--argc, ++argv;
 	    } else if (ret == 1) {
 		continue;
 	    } else if (!strcmp(p, "-batch")) {
 		console_batch_mode = 1;
+	    } else {
+		fprintf(stderr, "plink: unknown option \"%s\"\n", p);
+		errors = 1;
 	    }
 	} else if (*p) {
 	    if (!*cfg.host) {
@@ -423,6 +429,9 @@ int main(int argc, char **argv)
 	}
     }
 
+    if (errors)
+	return 1;
+
     if (!*cfg.host) {
 	usage();
     }
@@ -529,11 +538,14 @@ int main(int argc, char **argv)
 	int nodelay = cfg.tcp_nodelay &&
 	    (GetFileType(GetStdHandle(STD_INPUT_HANDLE)) == FILE_TYPE_CHAR);
 
-	error = back->init(cfg.host, cfg.port, &realhost, nodelay);
+	error = back->init(NULL, &backhandle, cfg.host, cfg.port,
+			   &realhost, nodelay);
 	if (error) {
 	    fprintf(stderr, "Unable to open connection:\n%s", error);
 	    return 1;
 	}
+	logctx = log_init(NULL);
+	back->provide_logctx(backhandle, logctx);
 	sfree(realhost);
     }
     connopen = 1;
@@ -585,7 +597,7 @@ int main(int argc, char **argv)
     while (1) {
 	int n;
 
-	if (!sending && back->sendok()) {
+	if (!sending && back->sendok(backhandle)) {
 	    /*
 	     * Create a separate thread to read from stdin. This is
 	     * a total pain, but I can't find another way to do it:
@@ -677,11 +689,11 @@ int main(int argc, char **argv)
 	} else if (n == 1) {
 	    reading = 0;
 	    noise_ultralight(idata.len);
-	    if (connopen && back->socket() != NULL) {
+	    if (connopen && back->socket(backhandle) != NULL) {
 		if (idata.len > 0) {
-		    back->send(idata.buffer, idata.len);
+		    back->send(backhandle, idata.buffer, idata.len);
 		} else {
-		    back->special(TS_EOF);
+		    back->special(backhandle, TS_EOF);
 		}
 	    }
 	} else if (n == 2) {
@@ -693,8 +705,8 @@ int main(int argc, char **argv)
 	    bufchain_consume(&stdout_data, odata.lenwritten);
 	    if (bufchain_size(&stdout_data) > 0)
 		try_output(0);
-	    if (connopen && back->socket() != NULL) {
-		back->unthrottle(bufchain_size(&stdout_data) +
+	    if (connopen && back->socket(backhandle) != NULL) {
+		back->unthrottle(backhandle, bufchain_size(&stdout_data) +
 				 bufchain_size(&stderr_data));
 	    }
 	} else if (n == 3) {
@@ -706,22 +718,22 @@ int main(int argc, char **argv)
 	    bufchain_consume(&stderr_data, edata.lenwritten);
 	    if (bufchain_size(&stderr_data) > 0)
 		try_output(1);
-	    if (connopen && back->socket() != NULL) {
-		back->unthrottle(bufchain_size(&stdout_data) +
+	    if (connopen && back->socket(backhandle) != NULL) {
+		back->unthrottle(backhandle, bufchain_size(&stdout_data) +
 				 bufchain_size(&stderr_data));
 	    }
 	}
-	if (!reading && back->sendbuffer() < MAX_STDIN_BACKLOG) {
+	if (!reading && back->sendbuffer(backhandle) < MAX_STDIN_BACKLOG) {
 	    SetEvent(idata.eventback);
 	    reading = 1;
 	}
-	if ((!connopen || back->socket() == NULL) &&
+	if ((!connopen || back->socket(backhandle) == NULL) &&
 	    bufchain_size(&stdout_data) == 0 &&
 	    bufchain_size(&stderr_data) == 0)
 	    break;		       /* we closed the connection */
     }
     WSACleanup();
-    exitcode = back->exitcode();
+    exitcode = back->exitcode(backhandle);
     if (exitcode < 0) {
 	fprintf(stderr, "Remote process exit code unavailable\n");
 	exitcode = 1;		       /* this is an error condition */