~mdw
/
sgt
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ben Rudiak-Gould points out that we should be using WM_APP as the base for
[sgt/putty]
/
windows
/
winplink.c
diff --git
a/windows/winplink.c
b/windows/winplink.c
index
9fca63c
..
a67a237
100644
(file)
--- a/
windows/winplink.c
+++ b/
windows/winplink.c
@@
-12,7
+12,7
@@
#include "storage.h"
#include "tree234.h"
#include "storage.h"
#include "tree234.h"
-#define WM_AGENT_CALLBACK (WM_
XUSER
+ 4)
+#define WM_AGENT_CALLBACK (WM_
APP
+ 4)
#define MAX_STDIN_BACKLOG 4096
#define MAX_STDIN_BACKLOG 4096
@@
-94,6
+94,8
@@
void ldisc_update(void *frontend, int echo, int edit)
SetConsoleMode(inhandle, mode);
}
SetConsoleMode(inhandle, mode);
}
+char *get_ttymode(void *frontend, const char *mode) { return NULL; }
+
struct input_data {
DWORD len;
char buffer[4096];
struct input_data {
DWORD len;
char buffer[4096];
@@
-210,7
+212,8
@@
static void usage(void)
printf("Usage: plink [options] [user@]host [command]\n");
printf(" (\"host\" can also be a PuTTY saved session name)\n");
printf("Options:\n");
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 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(" -v show verbose messages\n");
printf(" -load sessname Load settings from saved session\n");
printf(" -ssh -telnet -rlogin -raw\n");
@@
-339,6
+342,9
@@
int main(int argc, char **argv)
use_subsystem = 1;
} else if (!strcmp(p, "-V")) {
version();
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 {
fprintf(stderr, "plink: unknown option \"%s\"\n", p);
errors = 1;
@@
-592,16
+598,16
@@
int main(int argc, char **argv)
inhandle = GetStdHandle(STD_INPUT_HANDLE);
outhandle = GetStdHandle(STD_OUTPUT_HANDLE);
errhandle = GetStdHandle(STD_ERROR_HANDLE);
inhandle = GetStdHandle(STD_INPUT_HANDLE);
outhandle = GetStdHandle(STD_OUTPUT_HANDLE);
errhandle = GetStdHandle(STD_ERROR_HANDLE);
- GetConsoleMode(inhandle, &orig_console_mode);
- SetConsoleMode(inhandle, ENABLE_PROCESSED_INPUT);
-
- main_thread_id = GetCurrentThreadId();
-
/*
* 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.
*/
/*
* 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);
+
+ main_thread_id = GetCurrentThreadId();
+
handles[0] = netevent;
handles[1] = stdinevent;
handles[2] = stdoutevent;
handles[0] = netevent;
handles[1] = stdinevent;
handles[2] = stdoutevent;