Turned the old `Telnet Command' System-submenu into a more general

[u/mdw/putty] / console.c

diff --git a/console.c b/console.c
index 703e683..90b5fa4 100644 (file)
--- a/console.c
+++ b/console.c
@@ -15,6 +15,8 @@
 
 int console_batch_mode = FALSE;
 
+static void *console_logctx = NULL;
+
 /*
  * Clean up and exit.
  */
@@ -26,12 +28,10 @@ void cleanup_exit(int code)
     sk_cleanup();
     WSACleanup();
 
-    if (cfg.protocol == PROT_SSH) {
-       random_save_seed();
+    random_save_seed();
 #ifdef MSCRYPTOAPI
-       crypto_wrapup();
+    crypto_wrapup();
 #endif
-    }
 
     exit(code);
 }
@@ -137,6 +137,10 @@ void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
     }
 }
 
+void update_specials_menu(void *frontend)
+{
+}
+
 /*
  * Ask whether the selected cipher is acceptable (since it was
  * below the configured 'warn' threshold).
@@ -192,7 +196,7 @@ void askcipher(void *frontend, char *ciphername, int cs)
  * Ask whether to wipe a session log file before writing to it.
  * Returns 2 for wipe, 1 for append, 0 for cancel (don't log).
  */
-int askappend(void *frontend, char *filename)
+int askappend(void *frontend, Filename filename)
 {
     HANDLE hin;
     DWORD savemode, i;
@@ -212,15 +216,12 @@ int askappend(void *frontend, char *filename)
 
     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);
+       fprintf(stderr, msgtemplate_batch, FILENAME_MAX, filename.path);
        fflush(stderr);
        return 0;
     }
-    fprintf(stderr, msgtemplate, FILENAME_MAX, filename);
+    fprintf(stderr, msgtemplate, FILENAME_MAX, filename.path);
     fflush(stderr);
 
     hin = GetStdHandle(STD_INPUT_HANDLE);
@@ -264,8 +265,15 @@ void old_keyfile_warning(void)
     fputs(message, stderr);
 }
 
+void console_provide_logctx(void *logctx)
+{
+    console_logctx = logctx;
+}
+
 void logevent(void *frontend, char *string)
 {
+    if (console_logctx)
+       log_eventlog(console_logctx, string);
 }
 
 int console_get_line(const char *prompt, char *str,