ncurses 6.2 - patch 20210904

[ncurses.git] / ncurses / base / lib_getstr.c

diff --git a/ncurses/base/lib_getstr.c b/ncurses/base/lib_getstr.c
index fecb3e7020fdaeb06a06b831d7f9a9dc8ed30a22..5feb351ae3c6732de3513a773c159e33760f2b19 100644 (file)
--- a/ncurses/base/lib_getstr.c
+++ b/ncurses/base/lib_getstr.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998-2011,2017 Free Software Foundation, Inc.              *
+ * Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ * Copyright 1998-2011,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -38,9 +39,10 @@
 **
 */
 
+#define NEED_KEY_EVENT
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_getstr.c,v 1.31 2017/03/25 21:09:51 tom Exp $")
+MODULE_ID("$Id: lib_getstr.c,v 1.37 2021/09/04 10:29:15 tom Exp $")
 
 /*
  * This wipes out the last character, no matter whether it was a tab, control
@@ -88,6 +90,8 @@ wgetnstr_events(WINDOW *win,
     if (!win || !str)
        returnCode(ERR);
 
+    maxlen = _nc_getstr_limit(maxlen);
+
     NCURSES_SP_NAME(_nc_get_tty_mode) (NCURSES_SP_ARGx &buf);
 
     oldnl = sp->_nl;
@@ -96,8 +100,7 @@ wgetnstr_events(WINDOW *win,
     oldcbreak = sp->_cbreak;
     NCURSES_SP_NAME(nl) (NCURSES_SP_ARG);
     NCURSES_SP_NAME(noecho) (NCURSES_SP_ARG);
-    NCURSES_SP_NAME(noraw) (NCURSES_SP_ARG);
-    NCURSES_SP_NAME(cbreak) (NCURSES_SP_ARG);
+    NCURSES_SP_NAME(raw) (NCURSES_SP_ARG);
 
     erasec = NCURSES_SP_NAME(erasechar) (NCURSES_SP_ARG);
     killc = NCURSES_SP_NAME(killchar) (NCURSES_SP_ARG);
@@ -111,7 +114,7 @@ wgetnstr_events(WINDOW *win,
     while ((ch = wgetch_events(win, evl)) != ERR) {
        /*
         * Some terminals (the Wyse-50 is the most common) generate
-        * a \n from the down-arrow key.  With this logic, it's the
+        * a \n from the down-arrow key.  With this logic, it is the
         * user's choice whether to set kcud=\n for wgetch();
         * terminating *getstr() with \n should work either way.
         */
@@ -142,7 +145,7 @@ wgetnstr_events(WINDOW *win,
                str = WipeOut(win, y, x, oldstr, str, oldecho);
            }
        } else if (ch >= KEY_MIN
-                  || (maxlen >= 0 && str - oldstr >= maxlen)) {
+                  || (str - oldstr >= maxlen)) {
            NCURSES_SP_NAME(beep) (NCURSES_SP_ARG);
        } else {
            *str++ = (char) ch;