summaryrefslogtreecommitdiffstats
path: root/contrib/dialog/ui_getc.c
diff options
context:
space:
mode:
authornwhitehorn <nwhitehorn@FreeBSD.org>2012-10-21 18:25:12 +0000
committernwhitehorn <nwhitehorn@FreeBSD.org>2012-10-21 18:25:12 +0000
commit59ae05f843643afc6998fcc4b2b415d89a8635ee (patch)
tree74dabcbe10843be3b85112de4524f2abb8e4112f /contrib/dialog/ui_getc.c
parent2ad040bf3f552fc8b740e79fe6db1bf91414d583 (diff)
parenta94245b3d36b447d1f761028da7e072210e64b43 (diff)
downloadFreeBSD-src-59ae05f843643afc6998fcc4b2b415d89a8635ee.zip
FreeBSD-src-59ae05f843643afc6998fcc4b2b415d89a8635ee.tar.gz
Update dialog to 20120706: includes minor useability enhancements and
fixes for warnings encountered with clang.
Diffstat (limited to 'contrib/dialog/ui_getc.c')
-rw-r--r--contrib/dialog/ui_getc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/dialog/ui_getc.c b/contrib/dialog/ui_getc.c
index d9d5a93..b0ff15b 100644
--- a/contrib/dialog/ui_getc.c
+++ b/contrib/dialog/ui_getc.c
@@ -1,5 +1,5 @@
/*
- * $Id: ui_getc.c,v 1.63 2011/07/07 22:05:58 tom Exp $
+ * $Id: ui_getc.c,v 1.65 2011/10/20 23:45:48 tom Exp $
*
* ui_getc.c - user interface glue for getc()
*
@@ -294,8 +294,7 @@ valid_file(FILE *fp)
int fd = fileno(fp);
if (fd >= 0) {
- long result = 0;
- if ((result = fcntl(fd, F_GETFL, 0)) >= 0) {
+ if (fcntl(fd, F_GETFL, 0) >= 0) {
code = TRUE;
}
}
@@ -530,6 +529,7 @@ dlg_getc(WINDOW *win, int *fkey)
if (handle_others) {
if ((p = dialog_state.getc_redirect) != 0) {
if (!(p->handle_getc(p, ch, *fkey, &result))) {
+ done = (p->win == save_win) && (!p->keep_win);
dlg_remove_callback(p);
dialog_state.getc_redirect = 0;
win = save_win;
OpenPOWER on IntegriCloud