ncurses 6.2 - patch 20200906

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

diff --git a/ncurses/base/lib_ungetch.c b/ncurses/base/lib_ungetch.c
index 1f022b2da951cd3390e96343be52ce01eb5d9182..fcbe6f4a90c1fe3c32f79af2504bccc11ab249c3 100644 (file)
--- a/ncurses/base/lib_ungetch.c
+++ b/ncurses/base/lib_ungetch.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
+ * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 1998-2011,2012 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            *
@@ -42,7 +43,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_ungetch.c,v 1.12 2009/02/15 00:46:58 tom Exp $")
+MODULE_ID("$Id: lib_ungetch.c,v 1.17 2020/02/02 23:34:34 tom Exp $")
 
 #include <fifo_defs.h>
 
@@ -58,17 +59,20 @@ _nc_fifo_dump(SCREEN *sp)
 #endif /* TRACE */
 
 NCURSES_EXPORT(int)
-_nc_ungetch(SCREEN *sp, int ch)
+safe_ungetch(SCREEN *sp, int ch)
 {
     int rc = ERR;
 
-    if (tail != -1) {
-       if (head == -1) {
+    T((T_CALLED("ungetch(%p,%s)"), (void *) sp, _nc_tracechar(sp, ch)));
+
+    if (sp != 0 && tail >= 0) {
+       if (head < 0) {
            head = 0;
            t_inc();
            peek = tail;        /* no raw keys */
-       } else
+       } else {
            h_dec();
+       }
 
        sp->_fifo[head] = ch;
        T(("ungetch %s ok", _nc_tracechar(sp, ch)));
@@ -80,20 +84,11 @@ _nc_ungetch(SCREEN *sp, int ch)
 #endif
        rc = OK;
     }
-    return rc;
+    returnCode(rc);
 }
 
-NCURSES_EXPORT(int)
-NCURSES_SP_NAME(ungetch) (NCURSES_SP_DCLx int ch)
-{
-    T((T_CALLED("ungetch(%s)"), _nc_tracechar(SP_PARM, ch)));
-    returnCode(_nc_ungetch(SP_PARM, ch));
-}
-
-#if NCURSES_SP_FUNCS
 NCURSES_EXPORT(int)
 ungetch(int ch)
 {
-    return NCURSES_SP_NAME(ungetch) (CURRENT_SCREEN, ch);
+    return safe_ungetch(CURRENT_SCREEN, ch);
 }
-#endif