ncurses 6.1 - patch 20191005

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

diff --git a/ncurses/base/lib_ungetch.c b/ncurses/base/lib_ungetch.c
index 54a8998fbbb3f6d4b53c4028d7c88c3d030a5477..4ee9119e5c164425f6265c01fc8ae6be0dbe8c4e 100644 (file)
--- a/ncurses/base/lib_ungetch.c
+++ b/ncurses/base/lib_ungetch.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
+ * Copyright (c) 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 +42,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_ungetch.c,v 1.13 2009/04/18 20:30:12 tom Exp $")
+MODULE_ID("$Id: lib_ungetch.c,v 1.16 2012/08/04 17:38:53 tom Exp $")
 
 #include <fifo_defs.h>
 
@@ -62,15 +62,16 @@ safe_ungetch(SCREEN *sp, int ch)
 {
     int rc = ERR;
 
-    T((T_CALLED("ungetch(%p,%s)"), sp, _nc_tracechar(sp, ch)));
+    T((T_CALLED("ungetch(%p,%s)"), (void *) sp, _nc_tracechar(sp, ch)));
 
-    if (tail != -1) {
-       if (head == -1) {
+    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)));