Move MODULE files out of individual project directories into a

[PuTTY.git] / console.c

diff --git a/console.c b/console.c
index 557c144772084d5d5be0f7a731cf3eb73824e622..e49eaa099a90b7395542d8b5365e077341c93fea 100644 (file)
--- a/console.c
+++ b/console.c
@@ -212,6 +212,9 @@ 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);
@@ -258,27 +261,12 @@ void logevent(char *string)
 {
 }
 
-char *console_password = NULL;
-
 int console_get_line(const char *prompt, char *str,
                            int maxlen, int is_pw)
 {
     HANDLE hin, hout;
     DWORD savemode, newmode, i;
 
-    if (is_pw && console_password) {
-       static int tried_once = 0;
-
-       if (tried_once) {
-           return 0;
-       } else {
-           strncpy(str, console_password, maxlen);
-           str[maxlen - 1] = '\0';
-           tried_once = 1;
-           return 1;
-       }
-    }
-
     if (console_batch_mode) {
        if (maxlen > 0)
            str[0] = '\0';