/*
- * PLink - a command-line (stdin/stdout) variant of PuTTY.
+ * PLink - a Windows command-line (stdin/stdout) variant of PuTTY.
*/
-#ifndef AUTO_WINSOCK
-#include <winsock2.h>
-#endif
-#include <windows.h>
#include <stdio.h>
#include <stdlib.h>
#include <assert.h>
vfprintf(stderr, p, ap);
va_end(ap);
fputc('\n', stderr);
- WSACleanup();
cleanup_exit(1);
}
void modalfatalbox(char *p, ...)
vfprintf(stderr, p, ap);
va_end(ap);
fputc('\n', stderr);
- WSACleanup();
cleanup_exit(1);
}
void connection_fatal(void *frontend, char *p, ...)
vfprintf(stderr, p, ap);
va_end(ap);
fputc('\n', stderr);
- WSACleanup();
cleanup_exit(1);
}
void cmdline_error(char *p, ...)
{
int osize, esize;
- assert(len > 0);
-
if (is_stderr) {
bufchain_add(&stderr_data, data, len);
try_output(1);
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");
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");
exit(1);
}
+static void version(void)
+{
+ printf("plink: %s\n", ver);
+ exit(1);
+}
+
char *do_select(SOCKET skt, int startup)
{
int events;
} else {
events = 0;
}
- if (WSAEventSelect(skt, netevent, events) == SOCKET_ERROR) {
- switch (WSAGetLastError()) {
+ if (p_WSAEventSelect(skt, netevent, events) == SOCKET_ERROR) {
+ switch (p_WSAGetLastError()) {
case WSAENETDOWN:
return "Network is down";
default:
- return "WSAAsyncSelect(): unknown error";
+ return "WSAEventSelect(): unknown error";
}
}
return NULL;
int main(int argc, char **argv)
{
- WSADATA wsadata;
- WORD winsock_ver;
WSAEVENT stdinevent, stdoutevent, stderrevent;
HANDLE handles[4];
DWORD in_threadid, out_threadid, err_threadid;
} else if (!strcmp(p, "-s")) {
/* Save status to write to cfg later. */
use_subsystem = 1;
+ } else if (!strcmp(p, "-V")) {
+ version();
} else {
fprintf(stderr, "plink: unknown option \"%s\"\n", p);
errors = 1;
if (portnumber != -1)
cfg.port = portnumber;
- /*
- * Initialise WinSock.
- */
- winsock_ver = MAKEWORD(2, 0);
- if (WSAStartup(winsock_ver, &wsadata)) {
- MessageBox(NULL, "Unable to initialise WinSock", "WinSock Error",
- MB_OK | MB_ICONEXCLAMATION);
- return 1;
- }
- if (LOBYTE(wsadata.wVersion) != 2 || HIBYTE(wsadata.wVersion) != 0) {
- MessageBox(NULL, "WinSock version is incompatible with 2.0",
- "WinSock Error", MB_OK | MB_ICONEXCLAMATION);
- WSACleanup();
+ sk_init();
+ if (p_WSAEventSelect == NULL) {
+ fprintf(stderr, "Plink requires WinSock 2\n");
return 1;
}
- sk_init();
/*
* Start up the connection.
WPARAM wp;
socket = sklist[i];
wp = (WPARAM) socket;
- if (!WSAEnumNetworkEvents(socket, NULL, &things)) {
+ if (!p_WSAEnumNetworkEvents(socket, NULL, &things)) {
static const struct { int bit, mask; } eventtypes[] = {
{FD_CONNECT_BIT, FD_CONNECT},
{FD_READ_BIT, FD_READ},
bufchain_size(&stderr_data) == 0)
break; /* we closed the connection */
}
- WSACleanup();
exitcode = back->exitcode(backhandle);
if (exitcode < 0) {
fprintf(stderr, "Remote process exit code unavailable\n");
exitcode = 1; /* this is an error condition */
}
- return exitcode;
+ cleanup_exit(exitcode);
+ return 0; /* placate compiler warning */
}