1 files changed, 29 insertions, 27 deletions

diff --git a/scripts/kconfig/libcurses/getch.c b/scripts/kconfig/libcurses/getch.c
index fa0c674b5..8719ca39c 100644
--- a/scripts/kconfig/libcurses/getch.c
+++ b/scripts/kconfig/libcurses/getch.c
@@ -93,14 +93,6 @@ getch
 
 #include <stdlib.h>
 
-#define _INBUFSIZ   512 /* size of terminal input buffer */
-#define NUNGETCH    256 /* max # chars to ungetch() */
-
-static int c_pindex = 0;    /* putter index */
-static int c_gindex = 1;    /* getter index */
-static int c_ungind = 0;    /* ungetch() push index */
-static int c_ungch[NUNGETCH];   /* array of ungotten chars */
-
 static int _get_box(int *y_start, int *y_end, int *x_start, int *x_end)
 {
     int start, end;
@@ -166,7 +158,7 @@ static void _copy(void)
 
 #ifdef PDC_WIDE
     wtmp = malloc((len + 1) * sizeof(wchar_t));
-    len *= 3;
+    len *= 4;
 #endif
     tmp = malloc(len + 1);
 
@@ -204,7 +196,7 @@ static int _paste(void)
 # define PASTE paste
 #endif
     char *paste;
-    long len;
+    long len, newmax;
     int key;
 
     key = PDC_getclipboard(&paste, &len);
@@ -215,6 +207,14 @@ static int _paste(void)
     wpaste = malloc(len * sizeof(wchar_t));
     len = PDC_mbstowcs(wpaste, paste, len);
 #endif
+    newmax = len + SP->c_ungind;
+    if (newmax > SP->c_ungmax)
+    {
+        SP->c_ungch = realloc(SP->c_ungch, newmax * sizeof(int));
+        if (!SP->c_ungch)
+            return -1;
+        SP->c_ungmax = newmax;
+    }
     while (len > 1)
         PDC_ungetch(PASTE[--len]);
     key = *PASTE;
@@ -322,7 +322,6 @@ static int _mouse_key(void)
 
 int wgetch(WINDOW *win)
 {
-    static int buffer[_INBUFSIZ];   /* character buffer */
     int key, waitcount;
 
     PDC_LOG(("wgetch() - called\n"));
@@ -357,18 +356,18 @@ int wgetch(WINDOW *win)
 
     /* if ungotten char exists, remove and return it */
 
-    if (c_ungind)
-        return c_ungch[--c_ungind];
+    if (SP->c_ungind)
+        return SP->c_ungch[--(SP->c_ungind)];
 
     /* if normal and data in buffer */
 
-    if ((!SP->raw_inp && !SP->cbreak) && (c_gindex < c_pindex))
-        return buffer[c_gindex++];
+    if ((!SP->raw_inp && !SP->cbreak) && (SP->c_gindex < SP->c_pindex))
+        return SP->c_buffer[SP->c_gindex++];
 
     /* prepare to buffer data */
 
-    c_pindex = 0;
-    c_gindex = 0;
+    SP->c_pindex = 0;
+    SP->c_gindex = 0;
 
     /* to get here, no keys are buffered. go and get one. */
 
@@ -453,17 +452,17 @@ int wgetch(WINDOW *win)
 
         if (key == '\b')
         {
-            if (c_pindex > c_gindex)
-                c_pindex--;
+            if (SP->c_pindex > SP->c_gindex)
+                SP->c_pindex--;
         }
         else
-            if (c_pindex < _INBUFSIZ - 2)
-                buffer[c_pindex++] = key;
+            if (SP->c_pindex < _INBUFSIZ - 2)
+                SP->c_buffer[SP->c_pindex++] = key;
 
         /* if we got a line */
 
         if (key == '\n' || key == '\r')
-            return buffer[c_gindex++];
+            return SP->c_buffer[SP->c_gindex++];
     }
 }
 
@@ -491,10 +490,10 @@ int PDC_ungetch(int ch)
 {
     PDC_LOG(("ungetch() - called\n"));
 
-    if (c_ungind >= NUNGETCH)   /* pushback stack full */
+    if (SP->c_ungind >= SP->c_ungmax)   /* pushback stack full */
         return ERR;
 
-    c_ungch[c_ungind++] = ch;
+    SP->c_ungch[SP->c_ungind++] = ch;
 
     return OK;
 }
@@ -503,11 +502,14 @@ int flushinp(void)
 {
     PDC_LOG(("flushinp() - called\n"));
 
+    if (!SP)
+        return ERR;
+
     PDC_flushinp();
 
-    c_gindex = 1;           /* set indices to kill buffer */
-    c_pindex = 0;
-    c_ungind = 0;           /* clear c_ungch array */
+    SP->c_gindex = 1;       /* set indices to kill buffer */
+    SP->c_pindex = 0;
+    SP->c_ungind = 0;       /* clear SP->c_ungch array */
 
     return OK;
 }