ncurses 5.9 - patch 20120303

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

diff --git a/ncurses/base/lib_ungetch.c b/ncurses/base/lib_ungetch.c
index 2eda99017bed066b226bd0c51998fee640aacf6f..32f9f82f62346fde0de6b25c8afbcbb28312dc91 100644 (file)
--- a/ncurses/base/lib_ungetch.c
+++ b/ncurses/base/lib_ungetch.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2009,2011 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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -30,6 +30,7 @@
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
  *     and: Thomas E. Dickey                        1996-on                 *
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
  *     and: Thomas E. Dickey                        1996-on                 *

+ *     and: Juergen Pfeifer                         2009                    *

  ****************************************************************************/
 
 /*
  ****************************************************************************/
 
 /*


@@ -41,7 +42,7 @@
 
 #include <curses.priv.h>
 
 
 #include <curses.priv.h>
 

-MODULE_ID("$Id: lib_ungetch.c,v 1.10 2008/05/03 20:20:58 tom Exp $")
+MODULE_ID("$Id: lib_ungetch.c,v 1.15 2011/05/28 22:52:06 tom Exp $")

 
 #include <fifo_defs.h>
 
 
 #include <fifo_defs.h>
 


@@ -52,16 +53,18 @@ _nc_fifo_dump(SCREEN *sp)
     int i;
     T(("head = %d, tail = %d, peek = %d", head, tail, peek));
     for (i = 0; i < 10; i++)
     int i;
     T(("head = %d, tail = %d, peek = %d", head, tail, peek));
     for (i = 0; i < 10; i++)

-       T(("char %d = %s", i, _tracechar(sp->_fifo[i])));
+       T(("char %d = %s", i, _nc_tracechar(sp, sp->_fifo[i])));

 }
 #endif /* TRACE */
 
 NCURSES_EXPORT(int)
 }
 #endif /* TRACE */
 
 NCURSES_EXPORT(int)

-_nc_ungetch(SCREEN *sp, int ch)
+safe_ungetch(SCREEN *sp, int ch)

 {
     int rc = ERR;
 
 {
     int rc = ERR;
 

-    if (tail != -1) {
+    T((T_CALLED("ungetch(%p,%s)"), (void *) sp, _nc_tracechar(sp, ch)));
+
+    if (sp != 0 && tail != -1) {

        if (head == -1) {
            head = 0;
            t_inc();
        if (head == -1) {
            head = 0;
            t_inc();


@@ -70,7 +73,7 @@ _nc_ungetch(SCREEN *sp, int ch)
            h_dec();
 
        sp->_fifo[head] = ch;
            h_dec();
 
        sp->_fifo[head] = ch;

-       T(("ungetch %s ok", _tracechar(ch)));
+       T(("ungetch %s ok", _nc_tracechar(sp, ch)));

 #ifdef TRACE
        if (USE_TRACEF(TRACE_IEVENT)) {
            _nc_fifo_dump(sp);
 #ifdef TRACE
        if (USE_TRACEF(TRACE_IEVENT)) {
            _nc_fifo_dump(sp);


@@ -79,12 +82,11 @@ _nc_ungetch(SCREEN *sp, int ch)
 #endif
        rc = OK;
     }
 #endif
        rc = OK;
     }

-    return rc;
+    returnCode(rc);

 }
 
 NCURSES_EXPORT(int)
 ungetch(int ch)
 {
 }
 
 NCURSES_EXPORT(int)
 ungetch(int ch)
 {

-    T((T_CALLED("ungetch(%s)"), _tracechar(ch)));
-    returnCode(_nc_ungetch(SP, ch));
+    return safe_ungetch(CURRENT_SCREEN, ch);

 }
 }