if (ret == 0) /* success - key matched OK */
return;
- if (ret == 2) /* key was different */
+ if (ret == 2) { /* key was different */
fprintf(stderr, wrongmsg, fingerprint);
- if (ret == 1) /* key was absent */
+ fflush(stderr);
+ }
+ if (ret == 1) { /* key was absent */
fprintf(stderr, absentmsg, fingerprint);
+ fflush(stderr);
+ }
hin = GetStdHandle(STD_INPUT_HANDLE);
GetConsoleMode(hin, &savemode);
printf(" -ssh force use of ssh protocol\n");
printf(" -P port connect to specified port\n");
printf(" -pw passw login with specified password\n");
+ printf(" -m file read remote command(s) from file\n");
exit(1);
}
--argc, username = *++argv;
strncpy(cfg.username, username, sizeof(cfg.username));
cfg.username[sizeof(cfg.username)-1] = '\0';
+ } else if (!strcmp(p, "-m") && argc > 1) {
+ char *filename, *command;
+ int cmdlen, cmdsize;
+ FILE *fp;
+ int c, d;
+
+ --argc, filename = *++argv;
+
+ cmdlen = cmdsize = 0;
+ command = NULL;
+ fp = fopen(filename, "r");
+ if (!fp) {
+ fprintf(stderr, "plink: unable to open command "
+ "file \"%s\"\n", filename);
+ return 1;
+ }
+ do {
+ c = fgetc(fp);
+ d = c;
+ if (c == EOF)
+ d = 0;
+ if (cmdlen >= cmdsize) {
+ cmdsize = cmdlen + 512;
+ command = srealloc(command, cmdsize);
+ }
+ command[cmdlen++] = d;
+ } while (c != EOF);
+ cfg.remote_cmd_ptr = command;
+ cfg.nopty = TRUE; /* command => no terminal */
} else if (!strcmp(p, "-P") && argc > 1) {
--argc, portnumber = atoi(*++argv);
}
strncpy(cfg.host, p, sizeof(cfg.host)-1);
cfg.host[sizeof(cfg.host)-1] = '\0';
cfg.port = default_port;
- } else
+ } else {
cfg = cfg2;
+ cfg.remote_cmd_ptr = cfg.remote_cmd;
+ }
} else {
*r++ = '\0';
strncpy(cfg.username, p, sizeof(cfg.username)-1);
usage();
}
- if (!*cfg.remote_cmd)
+ if (!*cfg.remote_cmd_ptr)
flags |= FLAG_INTERACTIVE;
/*
n = WaitForMultipleObjects(2, handles, FALSE, INFINITE);
if (n == 0) {
WSANETWORKEVENTS things;
- enum234 e;
SOCKET socket;
- extern SOCKET first_socket(enum234 *), next_socket(enum234 *);
+ extern SOCKET first_socket(int *), next_socket(int *);
extern int select_result(WPARAM, LPARAM);
- int i;
+ int i, socketstate;
/*
* We must not call select_result() for any socket
*/
/* Count the active sockets. */
i = 0;
- for (socket = first_socket(&e); socket != INVALID_SOCKET;
- socket = next_socket(&e))
+ for (socket = first_socket(&socketstate); socket != INVALID_SOCKET;
+ socket = next_socket(&socketstate))
i++;
/* Expand the buffer if necessary. */
/* Retrieve the sockets into sklist. */
skcount = 0;
- for (socket = first_socket(&e); socket != INVALID_SOCKET;
- socket = next_socket(&e)) {
+ for (socket = first_socket(&socketstate); socket != INVALID_SOCKET;
+ socket = next_socket(&socketstate)) {
sklist[skcount++] = socket;
}