Each platform's implementation of askappend() is no longer required

[u/mdw/putty] / console.c

diff --git a/console.c b/console.c
index 85f99dc..c9284b1 100644 (file)
--- a/console.c
+++ b/console.c
@@ -26,17 +26,15 @@ 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);
 }
 
-void verify_ssh_host_key(char *host, int port, char *keytype,
+void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
                         char *keystr, char *fingerprint)
 {
     int ret;
@@ -142,7 +140,7 @@ void verify_ssh_host_key(char *host, int port, char *keytype,
  * below the configured 'warn' threshold).
  * cs: 0 = both ways, 1 = client->server, 2 = server->client
  */
-void askcipher(char *ciphername, int cs)
+void askcipher(void *frontend, char *ciphername, int cs)
 {
     HANDLE hin;
     DWORD savemode, i;
@@ -192,7 +190,7 @@ void askcipher(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(char *filename)
+int askappend(void *frontend, char *filename)
 {
     HANDLE hin;
     DWORD savemode, i;
@@ -212,9 +210,6 @@ int askappend(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);
        fflush(stderr);
@@ -240,6 +235,13 @@ int askappend(char *filename)
 
 /*
  * Warn about the obsolescent key file format.
+ * 
+ * Uniquely among these functions, this one does _not_ expect a
+ * frontend handle. This means that if PuTTY is ported to a
+ * platform which requires frontend handles, this function will be
+ * an anomaly. Fortunately, the problem it addresses will not have
+ * been present on that platform, so it can plausibly be
+ * implemented as an empty function.
  */
 void old_keyfile_warning(void)
 {
@@ -257,7 +259,7 @@ void old_keyfile_warning(void)
     fputs(message, stderr);
 }
 
-void logevent(char *string)
+void logevent(void *frontend, char *string)
 {
 }