diff options
author | delphij <delphij@FreeBSD.org> | 2014-03-02 08:58:21 +0000 |
---|---|---|
committer | delphij <delphij@FreeBSD.org> | 2014-03-02 08:58:21 +0000 |
commit | 814c70500ada44e6fcd1d7bb0fb34b288ec5a85d (patch) | |
tree | a2372d7ccc967890376ec8bcddc202aba009ba79 /contrib/ncurses/ncurses/base/lib_ungetch.c | |
parent | e27a461d5d783b02dfeef266e5c61eb7234ff691 (diff) | |
parent | 7dbeede8ea0ed51949a0b6098fa7c110cfbfae42 (diff) | |
download | FreeBSD-src-814c70500ada44e6fcd1d7bb0fb34b288ec5a85d.zip FreeBSD-src-814c70500ada44e6fcd1d7bb0fb34b288ec5a85d.tar.gz |
MFV r262639: ncurses 5.9 20140222 snapshot.
Requested by: bapt
Diffstat (limited to 'contrib/ncurses/ncurses/base/lib_ungetch.c')
-rw-r--r-- | contrib/ncurses/ncurses/base/lib_ungetch.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/contrib/ncurses/ncurses/base/lib_ungetch.c b/contrib/ncurses/ncurses/base/lib_ungetch.c index 63a14cf..4ee9119 100644 --- a/contrib/ncurses/ncurses/base/lib_ungetch.c +++ b/contrib/ncurses/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.14 2009/10/24 22:12:21 tom Exp $") +MODULE_ID("$Id: lib_ungetch.c,v 1.16 2012/08/04 17:38:53 tom Exp $") #include <fifo_defs.h> @@ -64,13 +64,14 @@ safe_ungetch(SCREEN *sp, int 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))); |