aboutsummaryrefslogtreecommitdiff
path: root/readline/examples/rlfe
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2018-10-07 12:52:13 -0600
committerTom Tromey <tom@tromey.com>2019-08-12 10:57:56 -0600
commit775e241e9c5f2b2ff2b59972ab70e5f20763fae6 (patch)
tree597ab643dce69ee6e98e46ecac00ee85f447bb4b /readline/examples/rlfe
parent08132bdd876fa1825810f90ecc25390dd4ded457 (diff)
downloadgdb-775e241e9c5f2b2ff2b59972ab70e5f20763fae6.zip
gdb-775e241e9c5f2b2ff2b59972ab70e5f20763fae6.tar.gz
gdb-775e241e9c5f2b2ff2b59972ab70e5f20763fae6.tar.bz2
Import readline 7.0 (patch 5)
This imports readline 7.0 (up to patch 5) while preserving all gdb-local changes. This was done by checking out the readline git repository, making a branch based on the gdb baseline revision, applying the gdb changes to that branch, and then merging from readline 7. readline/ChangeLog.gdb 2019-08-12 Tom Tromey <tom@tromey.com> * Imported readline 7.0 patch 5.
Diffstat (limited to 'readline/examples/rlfe')
-rw-r--r--readline/examples/rlfe/config.h.in6
-rwxr-xr-xreadline/examples/rlfe/configure15
-rw-r--r--readline/examples/rlfe/configure.in4
-rw-r--r--readline/examples/rlfe/extern.h2
-rw-r--r--readline/examples/rlfe/os.h8
-rw-r--r--readline/examples/rlfe/rlfe.c9
6 files changed, 36 insertions, 8 deletions
diff --git a/readline/examples/rlfe/config.h.in b/readline/examples/rlfe/config.h.in
index dbfc369..a843fec 100644
--- a/readline/examples/rlfe/config.h.in
+++ b/readline/examples/rlfe/config.h.in
@@ -21,7 +21,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
****************************************************************
- * $Id$ FAU
+ * $Id: config.h.in,v 1.12 1994/05/31 12:31:36 mlschroe Exp $ FAU
*/
@@ -377,3 +377,7 @@
#undef HAVE_SYS_STROPTS_H
#undef HAVE_SYS_WAIT_H
+
+#undef HAVE_SGTTY_H
+
+#undef HAVE_SYS_SELECT_H
diff --git a/readline/examples/rlfe/configure b/readline/examples/rlfe/configure
index 73603b2..b6d9b5b 100755
--- a/readline/examples/rlfe/configure
+++ b/readline/examples/rlfe/configure
@@ -3705,6 +3705,7 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
+extern char *tgoto();
main()
{
exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1);
@@ -4341,7 +4342,7 @@ fi
done
-for ac_header in sys/stropts.h sys/wait.h
+for ac_header in sys/stropts.h sys/wait.h sgtty.h sys/select.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -4354,6 +4355,18 @@ fi
done
+for ac_header in term.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "term.h" "ac_cv_header_term_h" "$ac_includes_default"
+if test "x$ac_cv_header_term_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_TERM_H 1
+_ACEOF
+
+fi
+
+done
+
ac_config_files="$ac_config_files Makefile"
diff --git a/readline/examples/rlfe/configure.in b/readline/examples/rlfe/configure.in
index 108cd3f..5c0678a 100644
--- a/readline/examples/rlfe/configure.in
+++ b/readline/examples/rlfe/configure.in
@@ -225,6 +225,7 @@ AC_TRY_LINK(,tgetent((char *)0, (char *)0);,,
AC_MSG_ERROR(!!! no tgetent - no screen))))))
AC_TRY_RUN([
+extern char *tgoto();
main()
{
exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1);
@@ -437,6 +438,7 @@ main()
fi
-AC_CHECK_HEADERS(sys/stropts.h sys/wait.h)
+AC_CHECK_HEADERS(sys/stropts.h sys/wait.h sgtty.h sys/select.h)
+AC_CHECK_HEADERS(term.h)
AC_OUTPUT(Makefile)
diff --git a/readline/examples/rlfe/extern.h b/readline/examples/rlfe/extern.h
index e9a5d01..2fe5025 100644
--- a/readline/examples/rlfe/extern.h
+++ b/readline/examples/rlfe/extern.h
@@ -19,7 +19,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
****************************************************************
- * $Id$ FAU
+ * $Id: extern.h,v 1.18 1994/05/31 12:31:57 mlschroe Exp $ FAU
*/
#if !defined(__GNUC__) || __GNUC__ < 2
diff --git a/readline/examples/rlfe/os.h b/readline/examples/rlfe/os.h
index 734bc8c..df06c75 100644
--- a/readline/examples/rlfe/os.h
+++ b/readline/examples/rlfe/os.h
@@ -19,7 +19,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
****************************************************************
- * $Id$ FAU
+ * $Id: os.h,v 1.10 1994/05/31 12:32:22 mlschroe Exp $ FAU
*/
#include <stdio.h>
@@ -208,7 +208,9 @@ extern int errno;
# include <cytermio.h>
# endif
# else /* TERMIO */
-# include <sgtty.h>
+# if defined (HAVE_SGTTY_H)
+# include <sgtty.h>
+# endif
# endif /* TERMIO */
#endif /* POSIX */
@@ -490,7 +492,7 @@ extern int errno;
* select stuff
*/
-#if defined(M_XENIX) || defined(M_UNIX) || defined(_SEQUENT_)
+#if defined(M_XENIX) || defined(M_UNIX) || defined(_SEQUENT_) || defined (__INTERIX)
#include <sys/select.h> /* for timeval + FD... */
#endif
diff --git a/readline/examples/rlfe/rlfe.c b/readline/examples/rlfe/rlfe.c
index eacd5ab..f40b2dd 100644
--- a/readline/examples/rlfe/rlfe.c
+++ b/readline/examples/rlfe/rlfe.c
@@ -547,7 +547,14 @@ main(int argc, char** argv)
#endif
t.c_lflag &= ~(ICANON | ISIG | ECHO | ECHOCTL | ECHOE | \
- ECHOK | ECHOKE | ECHONL | ECHOPRT );
+ ECHOK | ECHONL
+#if defined (ECHOKE)
+ | ECHOKE
+#endif
+#if defined (ECHOPRT)
+ | ECHOPRT
+#endif
+ );
t.c_iflag &= ~ICRNL;
t.c_iflag |= IGNBRK;
t.c_cc[VMIN] = 1;