Remove tools again. Should have done it with svn merge --reintegrate

1 files changed, 0 insertions, 719 deletions

diff --git a/tools/plink/winplink.c b/tools/plink/winplink.c
deleted file mode 100644
index 525b1a212..000000000
--- a/tools/plink/winplink.c
+++ /dev/null
@@ -1,719 +0,0 @@
-/*

- * PLink - a Windows command-line (stdin/stdout) variant of PuTTY.

- */

-

-#include <stdio.h>

-#include <stdlib.h>

-#include <assert.h>

-#include <stdarg.h>

-

-#define PUTTY_DO_GLOBALS	       /* actually _define_ globals */

-#include "putty.h"

-#include "storage.h"

-#include "tree234.h"

-

-#define WM_AGENT_CALLBACK (WM_APP + 4)

-

-struct agent_callback {

-    void (*callback)(void *, void *, int);

-    void *callback_ctx;

-    void *data;

-    int len;

-};

-

-void fatalbox(char *p, ...)

-{

-    va_list ap;

-    fprintf(stderr, "FATAL ERROR: ");

-    va_start(ap, p);

-    vfprintf(stderr, p, ap);

-    va_end(ap);

-    fputc('\n', stderr);

-    if (logctx) {

-        log_free(logctx);

-        logctx = NULL;

-    }

-    cleanup_exit(1);

-}

-void modalfatalbox(char *p, ...)

-{

-    va_list ap;

-    fprintf(stderr, "FATAL ERROR: ");

-    va_start(ap, p);

-    vfprintf(stderr, p, ap);

-    va_end(ap);

-    fputc('\n', stderr);

-    if (logctx) {

-        log_free(logctx);

-        logctx = NULL;

-    }

-    cleanup_exit(1);

-}

-void connection_fatal(void *frontend, char *p, ...)

-{

-    va_list ap;

-    fprintf(stderr, "FATAL ERROR: ");

-    va_start(ap, p);

-    vfprintf(stderr, p, ap);

-    va_end(ap);

-    fputc('\n', stderr);

-    if (logctx) {

-        log_free(logctx);

-        logctx = NULL;

-    }

-    cleanup_exit(1);

-}

-void cmdline_error(char *p, ...)

-{

-    va_list ap;

-    fprintf(stderr, "plink: ");

-    va_start(ap, p);

-    vfprintf(stderr, p, ap);

-    va_end(ap);

-    fputc('\n', stderr);

-    exit(1);

-}

-

-HANDLE inhandle, outhandle, errhandle;

-struct handle *stdin_handle, *stdout_handle, *stderr_handle;

-DWORD orig_console_mode;

-int connopen;

-

-WSAEVENT netevent;

-

-static Backend *back;

-static void *backhandle;

-static Config cfg;

-

-int term_ldisc(Terminal *term, int mode)

-{

-    return FALSE;

-}

-void ldisc_update(void *frontend, int echo, int edit)

-{

-    /* Update stdin read mode to reflect changes in line discipline. */

-    DWORD mode;

-

-    mode = ENABLE_PROCESSED_INPUT;

-    if (echo)

-	mode = mode | ENABLE_ECHO_INPUT;

-    else

-	mode = mode & ~ENABLE_ECHO_INPUT;

-    if (edit)

-	mode = mode | ENABLE_LINE_INPUT;

-    else

-	mode = mode & ~ENABLE_LINE_INPUT;

-    SetConsoleMode(inhandle, mode);

-}

-

-char *get_ttymode(void *frontend, const char *mode) { return NULL; }

-

-int from_backend(void *frontend_handle, int is_stderr,

-		 const char *data, int len)

-{

-    if (is_stderr) {

-	handle_write(stderr_handle, data, len);

-    } else {

-	handle_write(stdout_handle, data, len);

-    }

-

-    return handle_backlog(stdout_handle) + handle_backlog(stderr_handle);

-}

-

-int from_backend_untrusted(void *frontend_handle, const char *data, int len)

-{

-    /*

-     * No "untrusted" output should get here (the way the code is

-     * currently, it's all diverted by FLAG_STDERR).

-     */

-    assert(!"Unexpected call to from_backend_untrusted()");

-    return 0; /* not reached */

-}

-

-int get_userpass_input(prompts_t *p, unsigned char *in, int inlen)

-{

-    int ret;

-    ret = cmdline_get_passwd_input(p, in, inlen);

-    if (ret == -1)

-	ret = console_get_userpass_input(p, in, inlen);

-    return ret;

-}

-

-static DWORD main_thread_id;

-

-void agent_schedule_callback(void (*callback)(void *, void *, int),

-			     void *callback_ctx, void *data, int len)

-{

-    struct agent_callback *c = snew(struct agent_callback);

-    c->callback = callback;

-    c->callback_ctx = callback_ctx;

-    c->data = data;

-    c->len = len;

-    PostThreadMessage(main_thread_id, WM_AGENT_CALLBACK, 0, (LPARAM)c);

-}

-

-/*

- *  Short description of parameters.

- */

-static void usage(void)

-{

-    printf("PuTTY Link: command-line connection utility\n");

-    printf("%s\n", ver);

-    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 and exit\n");

-    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("            force use of a particular protocol\n");

-    printf("  -P port   connect to specified port\n");

-    printf("  -l user   connect with specified username\n");

-    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-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");

-    printf("  -1 -2     force use of particular protocol version\n");

-    printf("  -4 -6     force use of IPv4 or IPv6\n");

-    printf("  -C        enable compression\n");

-    printf("  -i key    private key file for authentication\n");

-    printf("  -noagent  disable use of Pageant\n");

-    printf("  -agent    enable use of Pageant\n");

-    printf("  -m file   read remote command(s) from file\n");

-    printf("  -s        remote command is an SSH subsystem (SSH-2 only)\n");

-    printf("  -N        don't start a shell/command (SSH-2 only)\n");

-    printf("  -nc host:port\n");

-    printf("            open tunnel in place of session (SSH-2 only)\n");

-    exit(1);

-}

-

-static void version(void)

-{

-    printf("plink: %s\n", ver);

-    exit(1);

-}

-

-char *do_select(SOCKET skt, int startup)

-{

-    int events;

-    if (startup) {

-	events = (FD_CONNECT | FD_READ | FD_WRITE |

-		  FD_OOB | FD_CLOSE | FD_ACCEPT);

-    } else {

-	events = 0;

-    }

-    if (p_WSAEventSelect(skt, netevent, events) == SOCKET_ERROR) {

-	switch (p_WSAGetLastError()) {

-	  case WSAENETDOWN:

-	    return "Network is down";

-	  default:

-	    return "WSAEventSelect(): unknown error";

-	}

-    }

-    return NULL;

-}

-

-int stdin_gotdata(struct handle *h, void *data, int len)

-{

-    if (len < 0) {

-	/*

-	 * Special case: report read error.

-	 */

-	char buf[4096];

-	FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, -len, 0,

-		      buf, lenof(buf), NULL);

-	buf[lenof(buf)-1] = '\0';

-	if (buf[strlen(buf)-1] == '\n')

-	    buf[strlen(buf)-1] = '\0';

-	fprintf(stderr, "Unable to read from standard input: %s\n", buf);

-	cleanup_exit(0);

-    }

-    noise_ultralight(len);

-    if (connopen && back->connected(backhandle)) {

-	if (len > 0) {

-	    return back->send(backhandle, data, len);

-	} else {

-	    back->special(backhandle, TS_EOF);

-	    return 0;

-	}

-    } else

-	return 0;

-}

-

-void stdouterr_sent(struct handle *h, int new_backlog)

-{

-    if (new_backlog < 0) {

-	/*

-	 * Special case: report write error.

-	 */

-	char buf[4096];

-	FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, -new_backlog, 0,

-		      buf, lenof(buf), NULL);

-	buf[lenof(buf)-1] = '\0';

-	if (buf[strlen(buf)-1] == '\n')

-	    buf[strlen(buf)-1] = '\0';

-	fprintf(stderr, "Unable to write to standard %s: %s\n",

-		(h == stdout_handle ? "output" : "error"), buf);

-	cleanup_exit(0);

-    }

-    if (connopen && back->connected(backhandle)) {

-	back->unthrottle(backhandle, (handle_backlog(stdout_handle) +

-				      handle_backlog(stderr_handle)));

-    }

-}

-

-int main(int argc, char **argv)

-{

-    int sending;

-    int portnumber = -1;

-    SOCKET *sklist;

-    int skcount, sksize;

-    int exitcode;

-    int errors;

-    int use_subsystem = 0;

-    long now, next;

-

-    sklist = NULL;

-    skcount = sksize = 0;

-    /*

-     * Initialise port and protocol to sensible defaults. (These

-     * will be overridden by more or less anything.)

-     */

-    default_protocol = PROT_SSH;

-    default_port = 22;

-

-    flags = FLAG_STDERR;

-    /*

-     * Process the command line.

-     */

-    do_defaults(NULL, &cfg);

-    loaded_session = FALSE;

-    default_protocol = cfg.protocol;

-    default_port = cfg.port;

-    errors = 0;

-    {

-	/*

-	 * Override the default protocol if PLINK_PROTOCOL is set.

-	 */

-	char *p = getenv("PLINK_PROTOCOL");

-	if (p) {

-	    const Backend *b = backend_from_name(p);

-	    if (b) {

-		default_protocol = cfg.protocol = b->protocol;

-		default_port = cfg.port = b->default_port;

-	    }

-	}

-    }

-    while (--argc) {

-	char *p = *++argv;

-	if (*p == '-') {

-	    int ret = cmdline_process_param(p, (argc > 1 ? argv[1] : NULL),

-					    1, &cfg);

-	    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 if (!strcmp(p, "-s")) {

-		/* Save status to write to cfg later. */

-		use_subsystem = 1;

-	    } else if (!strcmp(p, "-V")) {

-                version();

-            } else if (!strcmp(p, "-pgpfp")) {

-                pgp_fingerprints();

-                exit(1);

-	    } else {

-		fprintf(stderr, "plink: unknown option \"%s\"\n", p);

-		errors = 1;

-	    }

-	} else if (*p) {

-	    if (!cfg_launchable(&cfg)) {

-		char *q = p;

-		/*

-		 * If the hostname starts with "telnet:", set the

-		 * protocol to Telnet and process the string as a

-		 * Telnet URL.

-		 */

-		if (!strncmp(q, "telnet:", 7)) {

-		    char c;

-

-		    q += 7;

-		    if (q[0] == '/' && q[1] == '/')

-			q += 2;

-		    cfg.protocol = PROT_TELNET;

-		    p = q;

-		    while (*p && *p != ':' && *p != '/')

-			p++;

-		    c = *p;

-		    if (*p)

-			*p++ = '\0';

-		    if (c == ':')

-			cfg.port = atoi(p);

-		    else

-			cfg.port = -1;

-		    strncpy(cfg.host, q, sizeof(cfg.host) - 1);

-		    cfg.host[sizeof(cfg.host) - 1] = '\0';

-		} else {

-		    char *r, *user, *host;

-		    /*

-		     * Before we process the [user@]host string, we

-		     * first check for the presence of a protocol

-		     * prefix (a protocol name followed by ",").

-		     */

-		    r = strchr(p, ',');

-		    if (r) {

-			const Backend *b;

-			*r = '\0';

-			b = backend_from_name(p);

-			if (b) {

-			    default_protocol = cfg.protocol = b->protocol;

-			    portnumber = b->default_port;

-			}

-			p = r + 1;

-		    }

-

-		    /*

-		     * A nonzero length string followed by an @ is treated

-		     * as a username. (We discount an _initial_ @.) The

-		     * rest of the string (or the whole string if no @)

-		     * is treated as a session name and/or hostname.

-		     */

-		    r = strrchr(p, '@');

-		    if (r == p)

-			p++, r = NULL; /* discount initial @ */

-		    if (r) {

-			*r++ = '\0';

-			user = p, host = r;

-		    } else {

-			user = NULL, host = p;

-		    }

-

-		    /*

-		     * Now attempt to load a saved session with the

-		     * same name as the hostname.

-		     */

-		    {

-			Config cfg2;

-			do_defaults(host, &cfg2);

-			if (loaded_session || !cfg_launchable(&cfg2)) {

-			    /* No settings for this host; use defaults */

-			    /* (or session was already loaded with -load) */

-			    strncpy(cfg.host, host, sizeof(cfg.host) - 1);

-			    cfg.host[sizeof(cfg.host) - 1] = '\0';

-			    cfg.port = default_port;

-			} else {

-			    cfg = cfg2;

-			}

-		    }

-

-		    if (user) {

-			/* Patch in specified username. */

-			strncpy(cfg.username, user,

-				sizeof(cfg.username) - 1);

-			cfg.username[sizeof(cfg.username) - 1] = '\0';

-		    }

-

-		}

-	    } else {

-		char *command;

-		int cmdlen, cmdsize;

-		cmdlen = cmdsize = 0;

-		command = NULL;

-

-		while (argc) {

-		    while (*p) {

-			if (cmdlen >= cmdsize) {

-			    cmdsize = cmdlen + 512;

-			    command = sresize(command, cmdsize, char);

-			}

-			command[cmdlen++]=*p++;

-		    }

-		    if (cmdlen >= cmdsize) {

-			cmdsize = cmdlen + 512;

-			command = sresize(command, cmdsize, char);

-		    }

-		    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 */

-	    }

-	}

-    }

-

-    if (errors)

-	return 1;

-

-    if (!cfg_launchable(&cfg)) {

-	usage();

-    }

-

-    /*

-     * Trim leading whitespace off the hostname if it's there.

-     */

-    {

-	int space = strspn(cfg.host, " \t");

-	memmove(cfg.host, cfg.host+space, 1+strlen(cfg.host)-space);

-    }

-

-    /* See if host is of the form user@host */

-    if (cfg_launchable(&cfg)) {

-	char *atsign = strrchr(cfg.host, '@');

-	/* Make sure we're not overflowing the user field */

-	if (atsign) {

-	    if (atsign - cfg.host < sizeof cfg.username) {

-		strncpy(cfg.username, cfg.host, atsign - cfg.host);

-		cfg.username[atsign - cfg.host] = '\0';

-	    }

-	    memmove(cfg.host, atsign + 1, 1 + strlen(atsign + 1));

-	}

-    }

-

-    /*

-     * Perform command-line overrides on session configuration.

-     */

-    cmdline_run_saved(&cfg);

-

-    /*

-     * Apply subsystem status.

-     */

-    if (use_subsystem)

-	cfg.ssh_subsys = TRUE;

-

-    /*

-     * Trim a colon suffix off the hostname if it's there.

-     */

-    cfg.host[strcspn(cfg.host, ":")] = '\0';

-

-    /*

-     * Remove any remaining whitespace from the hostname.

-     */

-    {

-	int p1 = 0, p2 = 0;

-	while (cfg.host[p2] != '\0') {

-	    if (cfg.host[p2] != ' ' && cfg.host[p2] != '\t') {

-		cfg.host[p1] = cfg.host[p2];

-		p1++;

-	    }

-	    p2++;

-	}

-	cfg.host[p1] = '\0';

-    }

-

-    if (!cfg.remote_cmd_ptr && !*cfg.remote_cmd && !*cfg.ssh_nc_host)

-	flags |= FLAG_INTERACTIVE;

-

-    /*

-     * Select protocol. This is farmed out into a table in a

-     * separate file to enable an ssh-free variant.

-     */

-    back = backend_from_proto(cfg.protocol);

-    if (back == NULL) {

-	fprintf(stderr,

-		"Internal fault: Unsupported protocol found\n");

-	return 1;

-    }

-

-    /*

-     * Select port.

-     */

-    if (portnumber != -1)

-	cfg.port = portnumber;

-

-    sk_init();

-    if (p_WSAEventSelect == NULL) {

-	fprintf(stderr, "Plink requires WinSock 2\n");

-	return 1;

-    }

-

-    logctx = log_init(NULL, &cfg);

-    console_provide_logctx(logctx);

-

-    /*

-     * Start up the connection.

-     */

-    netevent = CreateEvent(NULL, FALSE, FALSE, NULL);

-    {

-	const char *error;

-	char *realhost;

-	/* nodelay is only useful if stdin is a character device (console) */

-	int nodelay = cfg.tcp_nodelay &&

-	    (GetFileType(GetStdHandle(STD_INPUT_HANDLE)) == FILE_TYPE_CHAR);

-

-	error = back->init(NULL, &backhandle, &cfg, cfg.host, cfg.port,

-			   &realhost, nodelay, cfg.tcp_keepalives);

-	if (error) {

-	    fprintf(stderr, "Unable to open connection:\n%s", error);

-	    return 1;

-	}

-	back->provide_logctx(backhandle, logctx);

-	sfree(realhost);

-    }

-    connopen = 1;

-

-    inhandle = GetStdHandle(STD_INPUT_HANDLE);

-    outhandle = GetStdHandle(STD_OUTPUT_HANDLE);

-    errhandle = GetStdHandle(STD_ERROR_HANDLE);

-

-    /*

-     * Turn off ECHO and LINE input modes. We don't care if this

-     * call fails, because we know we aren't necessarily running in

-     * a console.

-     */

-    GetConsoleMode(inhandle, &orig_console_mode);

-    SetConsoleMode(inhandle, ENABLE_PROCESSED_INPUT);

-

-    /*

-     * Pass the output handles to the handle-handling subsystem.

-     * (The input one we leave until we're through the

-     * authentication process.)

-     */

-    stdout_handle = handle_output_new(outhandle, stdouterr_sent, NULL, 0);

-    stderr_handle = handle_output_new(errhandle, stdouterr_sent, NULL, 0);

-

-    main_thread_id = GetCurrentThreadId();

-

-    sending = FALSE;

-

-    now = GETTICKCOUNT();

-

-    while (1) {

-	int nhandles;

-	HANDLE *handles;	

-	int n;

-	DWORD ticks;

-

-	if (!sending && back->sendok(backhandle)) {

-	    stdin_handle = handle_input_new(inhandle, stdin_gotdata, NULL,

-					    0);

-	    sending = TRUE;

-	}

-

-	if (run_timers(now, &next)) {

-	    ticks = next - GETTICKCOUNT();

-	    if (ticks < 0) ticks = 0;  /* just in case */

-	} else {

-	    ticks = INFINITE;

-	}

-

-	handles = handle_get_events(&nhandles);

-	handles = sresize(handles, nhandles+1, HANDLE);

-	handles[nhandles] = netevent;

-	n = MsgWaitForMultipleObjects(nhandles+1, handles, FALSE, ticks,

-				      QS_POSTMESSAGE);

-	if ((unsigned)(n - WAIT_OBJECT_0) < (unsigned)nhandles) {

-	    handle_got_event(handles[n - WAIT_OBJECT_0]);

-	} else if (n == WAIT_OBJECT_0 + nhandles) {

-	    WSANETWORKEVENTS things;

-	    SOCKET socket;

-	    extern SOCKET first_socket(int *), next_socket(int *);

-	    extern int select_result(WPARAM, LPARAM);

-	    int i, socketstate;

-

-	    /*

-	     * We must not call select_result() for any socket

-	     * until we have finished enumerating within the tree.

-	     * This is because select_result() may close the socket

-	     * and modify the tree.

-	     */

-	    /* Count the active sockets. */

-	    i = 0;

-	    for (socket = first_socket(&socketstate);

-		 socket != INVALID_SOCKET;

-		 socket = next_socket(&socketstate)) i++;

-

-	    /* Expand the buffer if necessary. */

-	    if (i > sksize) {

-		sksize = i + 16;

-		sklist = sresize(sklist, sksize, SOCKET);

-	    }

-

-	    /* Retrieve the sockets into sklist. */

-	    skcount = 0;

-	    for (socket = first_socket(&socketstate);

-		 socket != INVALID_SOCKET;

-		 socket = next_socket(&socketstate)) {

-		sklist[skcount++] = socket;

-	    }

-

-	    /* Now we're done enumerating; go through the list. */

-	    for (i = 0; i < skcount; i++) {

-		WPARAM wp;

-		socket = sklist[i];

-		wp = (WPARAM) socket;

-		if (!p_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);

-

-                    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 == WAIT_OBJECT_0 + nhandles + 1) {

-	    MSG msg;

-	    while (PeekMessage(&msg, INVALID_HANDLE_VALUE,

-			       WM_AGENT_CALLBACK, WM_AGENT_CALLBACK,

-			       PM_REMOVE)) {

-		struct agent_callback *c = (struct agent_callback *)msg.lParam;

-		c->callback(c->callback_ctx, c->data, c->len);

-		sfree(c);

-	    }

-	}

-

-	if (n == WAIT_TIMEOUT) {

-	    now = next;

-	} else {

-	    now = GETTICKCOUNT();

-	}

-

-	sfree(handles);

-

-	if (sending)

-	    handle_unthrottle(stdin_handle, back->sendbuffer(backhandle));

-

-	if ((!connopen || !back->connected(backhandle)) &&

-	    handle_backlog(stdout_handle) + handle_backlog(stderr_handle) == 0)

-	    break;		       /* we closed the connection */

-    }

-    exitcode = back->exitcode(backhandle);

-    if (exitcode < 0) {

-	fprintf(stderr, "Remote process exit code unavailable\n");

-	exitcode = 1;		       /* this is an error condition */

-    }

-    cleanup_exit(exitcode);

-    return 0;			       /* placate compiler warning */

-}