console_get_line() returns failure iff console_batch_mode is set, whereas

before is would return success and the empty string. IMO this makes `-batch'
much more useful; before, utilities such as Plink in `-batch' mode would
attempt to plough on using empty strings for usernames, passwords, and so on.

git-svn-id: svn://svn.tartarus.org/sgt/putty@4832 cda61777-01e9-0310-a592-d414129be87e

diff --git a/unix/uxcons.c b/unix/uxcons.c
index 3ed7ebf..00a6835 100644 (file)
--- a/unix/uxcons.c
+++ b/unix/uxcons.c
@@ -280,6 +280,7 @@ int console_get_line(const char *prompt, char *str,
     if (console_batch_mode) {
        if (maxlen > 0)
            str[0] = '\0';
+       return 0;
     } else {
        tcgetattr(0, &oldmode);
        newmode = oldmode;
@@ -302,8 +303,9 @@ int console_get_line(const char *prompt, char *str,
 
        if (is_pw)
            fputs("\n", stdout);
+
+       return 1;
     }
-    return 1;
 }
 
 void frontend_keypress(void *handle)

diff --git a/windows/wincons.c b/windows/wincons.c
index 03bb472..757f753 100644 (file)
--- a/windows/wincons.c
+++ b/windows/wincons.c
@@ -282,6 +282,7 @@ int console_get_line(const char *prompt, char *str,
     if (console_batch_mode) {
        if (maxlen > 0)
            str[0] = '\0';
+       return 0;
     } else {
        hin = GetStdHandle(STD_INPUT_HANDLE);
        hout = GetStdHandle(STD_OUTPUT_HANDLE);
@@ -312,8 +313,8 @@ int console_get_line(const char *prompt, char *str,
        if (is_pw)
            WriteFile(hout, "\r\n", 2, &i, NULL);
 
+       return 1;
     }
-    return 1;
 }
 
 void frontend_keypress(void *handle)