Sebastian Kuschel reports that pfd_closing can be called for a socket

[u/mdw/putty] / unix / uxcons.c

diff --git a/unix/uxcons.c b/unix/uxcons.c
index 4c14eb6..882d2c9 100644 (file)
--- a/unix/uxcons.c
+++ b/unix/uxcons.c
@@ -70,7 +70,7 @@ void notify_remote_exit(void *frontend)
 {
 }
 
-void timer_change_notify(long next)
+void timer_change_notify(unsigned long next)
 {
 }
 
@@ -235,7 +235,7 @@ int askalg(void *frontend, const char *algtype, const char *algname,
  * 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, Filename filename,
+int askappend(void *frontend, Filename *filename,
              void (*callback)(void *ctx, int result), void *ctx)
 {
     static const char msgtemplate[] =
@@ -256,11 +256,11 @@ int askappend(void *frontend, Filename filename,
 
     premsg(&cf);
     if (console_batch_mode) {
-       fprintf(stderr, msgtemplate_batch, FILENAME_MAX, filename.path);
+       fprintf(stderr, msgtemplate_batch, FILENAME_MAX, filename->path);
        fflush(stderr);
        return 0;
     }
-    fprintf(stderr, msgtemplate, FILENAME_MAX, filename.path);
+    fprintf(stderr, msgtemplate, FILENAME_MAX, filename->path);
     fflush(stderr);
 
     {
@@ -321,10 +321,12 @@ void console_provide_logctx(void *logctx)
 void logevent(void *frontend, const char *string)
 {
     struct termios cf;
-    premsg(&cf);
+    if ((flags & FLAG_STDERR) && (flags & FLAG_VERBOSE))
+        premsg(&cf);
     if (console_logctx)
        log_eventlog(console_logctx, string);
-    postmsg(&cf);
+    if ((flags & FLAG_STDERR) && (flags & FLAG_VERBOSE))
+        postmsg(&cf);
 }
 
 /*
@@ -374,7 +376,7 @@ int console_get_userpass_input(prompts_t *p, unsigned char *in, int inlen)
     {
        int i;
        for (i = 0; i < p->n_prompts; i++)
-           memset(p->prompts[i]->result, 0, p->prompts[i]->result_len);
+            prompt_set_result(p->prompts[i], "");
     }
 
     if (p->n_prompts && console_batch_mode)
@@ -403,7 +405,7 @@ int console_get_userpass_input(prompts_t *p, unsigned char *in, int inlen)
     for (curr_prompt = 0; curr_prompt < p->n_prompts; curr_prompt++) {
 
        struct termios oldmode, newmode;
-       int i;
+       int len;
        prompt_t *pr = p->prompts[curr_prompt];
 
        tcgetattr(infd, &oldmode);
@@ -417,17 +419,34 @@ int console_get_userpass_input(prompts_t *p, unsigned char *in, int inlen)
 
        console_prompt_text(outfp, pr->prompt, strlen(pr->prompt));
 
-       i = read(infd, pr->result, pr->result_len - 1);
+        len = 0;
+        while (1) {
+            int ret;
+
+            prompt_ensure_result_size(pr, len * 5 / 4 + 512);
+            ret = read(infd, pr->result + len, pr->resultsize - len - 1);
+            if (ret <= 0) {
+                len = -1;
+                break;
+            }
+            len += ret;
+            if (pr->result[len - 1] == '\n') {
+                len--;
+                break;
+            }
+        }
 
        tcsetattr(infd, TCSANOW, &oldmode);
 
-       if (i > 0 && pr->result[i-1] == '\n')
-           i--;
-       pr->result[i] = '\0';
-
        if (!pr->echo)
            console_prompt_text(outfp, "\n", 1);
 
+        if (len < 0) {
+            console_close(outfp, infd);
+            return 0;                  /* failure due to read error */
+        }
+
+       pr->result[len] = '\0';
     }
 
     console_close(outfp, infd);