If getln() sees a newline as its first character, it incorrectly

references a character one byte before the start of its input
buffer.

diff --git a/uip/prompter.c b/uip/prompter.c
index 37f5960b0c322a622af6775c38d62361bc1420ce..b43d0c74ca592b3beeb6ec13e9bbbd6379dcf806 100644 (file)
--- a/uip/prompter.c
+++ b/uip/prompter.c
@@ -329,6 +329,7 @@ getln (char *buffer, int n)
 {
     int c;
     char *cp;
 {
     int c;
     char *cp;

+    static int quoting = 0;

 
     cp = buffer;
     *cp = 0;
 
     cp = buffer;
     *cp = 0;


@@ -350,12 +351,13 @@ getln (char *buffer, int n)
     for (;;) {
        switch (c = getchar ()) {
            case EOF: 
     for (;;) {
        switch (c = getchar ()) {
            case EOF: 

+               quoting = 0;

                clearerr (stdin);
                longjmp (sigenv, DONE);
 
            case '\n': 
                clearerr (stdin);
                longjmp (sigenv, DONE);
 
            case '\n': 

-               if (cp[-1] == QUOTE) {
-                   cp[-1] = c;
+               if (quoting) {
+                   *(cp - 1) = c;

                    wtuser = 0;
                    return 1;
                }
                    wtuser = 0;
                    return 1;
                }


@@ -365,6 +367,11 @@ getln (char *buffer, int n)
                return 0;
 
            default: 
                return 0;
 
            default: 

+               if (c == QUOTE) {
+                   quoting = 1;
+               } else {
+                   quoting = 0;
+               }

                if (cp < buffer + n)
                    *cp++ = c;
                *cp = 0;
                if (cp < buffer + n)
                    *cp++ = c;
                *cp = 0;