[src/trunk]: src/lib/libedit expose rl_catch_signals and explain what we are ...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6d07cf79baa1
branches:  trunk
changeset: 786985:6d07cf79baa1
user:      christos <christos%NetBSD.org@localhost>
date:      Tue May 28 00:10:34 2013 +0000

description:
expose rl_catch_signals and explain what we are doing.

diffstat:

 lib/libedit/readline.c          |  13 ++++++++++---
 lib/libedit/readline/readline.h |   4 +++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diffs (59 lines):

diff -r c8ce2bd8a43c -r 6d07cf79baa1 lib/libedit/readline.c
--- a/lib/libedit/readline.c    Mon May 27 23:55:55 2013 +0000
+++ b/lib/libedit/readline.c    Tue May 28 00:10:34 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: readline.c,v 1.107 2013/01/13 15:46:57 christos Exp $  */
+/*     $NetBSD: readline.c,v 1.108 2013/05/28 00:10:34 christos Exp $  */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include "config.h"
 #if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: readline.c,v 1.107 2013/01/13 15:46:57 christos Exp $");
+__RCSID("$NetBSD: readline.c,v 1.108 2013/05/28 00:10:34 christos Exp $");
 #endif /* not lint && not SCCSID */
 
 #include <sys/types.h>
@@ -84,6 +84,14 @@
 KEYMAP_ENTRY_ARRAY emacs_standard_keymap,
     emacs_meta_keymap,
     emacs_ctlx_keymap;
+/*
+ * The following is not implemented; we always catch signals in the
+ * libedit fashion: set handlers on entry to el_gets() and clear them
+ * on the way out. This simplistic approach works for most cases; if
+ * it does not work for your application, please let us know.
+ */
+int rl_catch_signals = 1;
+int rl_catch_sigwinch = 1;
 
 int history_base = 1;          /* probably never subject to change */
 int history_length = 0;
@@ -109,7 +117,6 @@
 int rl_already_prompted = 0;
 int rl_filename_completion_desired = 0;
 int rl_ignore_completion_duplicates = 0;
-int rl_catch_signals = 1;
 int readline_echoing_p = 1;
 int _rl_print_completions_horizontally = 0;
 VFunction *rl_redisplay_function = NULL;
diff -r c8ce2bd8a43c -r 6d07cf79baa1 lib/libedit/readline/readline.h
--- a/lib/libedit/readline/readline.h   Mon May 27 23:55:55 2013 +0000
+++ b/lib/libedit/readline/readline.h   Tue May 28 00:10:34 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: readline.h,v 1.33 2012/05/15 17:30:04 christos Exp $   */
+/*     $NetBSD: readline.h,v 1.34 2013/05/28 00:10:34 christos Exp $   */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -125,6 +125,8 @@
 /*
  * The following is not implemented
  */
+extern int             rl_catch_signals;
+extern int             rl_catch_sigwinch;
 extern KEYMAP_ENTRY_ARRAY emacs_standard_keymap,
                        emacs_meta_keymap,
                        emacs_ctlx_keymap;