~mdw
/
sgt
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't log every keypress by default here either.
[sgt/putty]
/
console.c
diff --git
a/console.c
b/console.c
index
703e683
..
27366de
100644
(file)
--- a/
console.c
+++ b/
console.c
@@
-15,6
+15,8
@@
int console_batch_mode = FALSE;
int console_batch_mode = FALSE;
+static void *console_logctx = NULL;
+
/*
* Clean up and exit.
*/
/*
* Clean up and exit.
*/
@@
-26,12
+28,10
@@
void cleanup_exit(int code)
sk_cleanup();
WSACleanup();
sk_cleanup();
WSACleanup();
- if (cfg.protocol == PROT_SSH) {
- random_save_seed();
+ random_save_seed();
#ifdef MSCRYPTOAPI
#ifdef MSCRYPTOAPI
-
crypto_wrapup();
+ crypto_wrapup();
#endif
#endif
- }
exit(code);
}
exit(code);
}
@@
-212,9
+212,6
@@
int askappend(void *frontend, char *filename)
char line[32];
char line[32];
- if (cfg.logxfovr != LGXF_ASK) {
- return ((cfg.logxfovr == LGXF_OVR) ? 2 : 1);
- }
if (console_batch_mode) {
fprintf(stderr, msgtemplate_batch, FILENAME_MAX, filename);
fflush(stderr);
if (console_batch_mode) {
fprintf(stderr, msgtemplate_batch, FILENAME_MAX, filename);
fflush(stderr);
@@
-264,8
+261,15
@@
void old_keyfile_warning(void)
fputs(message, stderr);
}
fputs(message, stderr);
}
+void console_provide_logctx(void *logctx)
+{
+ console_logctx = logctx;
+}
+
void logevent(void *frontend, char *string)
{
void logevent(void *frontend, char *string)
{
+ if (console_logctx)
+ log_eventlog(console_logctx, string);
}
int console_get_line(const char *prompt, char *str,
}
int console_get_line(const char *prompt, char *str,