2011-04-08 Joel Sherrill <joel.sherrill@oarcorp.com>

	* RTEMS_Makefiles/Makefile.readline-6.2, readline-6.2/CHANGELOG,
	readline-6.2/CHANGES, readline-6.2/COPYING, readline-6.2/INSTALL,
	readline-6.2/MANIFEST, readline-6.2/Makefile.in, readline-6.2/NEWS,
	readline-6.2/README, readline-6.2/USAGE, readline-6.2/aclocal.m4,
	readline-6.2/ansi_stdlib.h, readline-6.2/bind.c,
	readline-6.2/callback.c, readline-6.2/chardefs.h,
	readline-6.2/compat.c, readline-6.2/complete.c,
	readline-6.2/config.h.in, readline-6.2/configure,
	readline-6.2/configure.in, readline-6.2/display.c,
	readline-6.2/emacs_keymap.c, readline-6.2/funmap.c,
	readline-6.2/histexpand.c, readline-6.2/histfile.c,
	readline-6.2/histlib.h, readline-6.2/history.c,
	readline-6.2/history.h, readline-6.2/histsearch.c,
	readline-6.2/input.c, readline-6.2/isearch.c, readline-6.2/keymaps.c,
	readline-6.2/keymaps.h, readline-6.2/kill.c, readline-6.2/macro.c,
	readline-6.2/mbutil.c, readline-6.2/misc.c, readline-6.2/nls.c,
	readline-6.2/parens.c, readline-6.2/patchlevel,
	readline-6.2/posixdir.h, readline-6.2/posixjmp.h,
	readline-6.2/posixselect.h, readline-6.2/posixstat.h,
	readline-6.2/readline.c, readline-6.2/readline.h,
	readline-6.2/rlconf.h, readline-6.2/rldefs.h,
	readline-6.2/rlmbutil.h, readline-6.2/rlprivate.h,
	readline-6.2/rlshell.h, readline-6.2/rlstdc.h, readline-6.2/rltty.c,
	readline-6.2/rltty.h, readline-6.2/rltypedefs.h,
	readline-6.2/rlwinsize.h, readline-6.2/savestring.c,
	readline-6.2/search.c, readline-6.2/shell.c, readline-6.2/signals.c,
	readline-6.2/tcap.h, readline-6.2/terminal.c, readline-6.2/text.c,
	readline-6.2/tilde.c, readline-6.2/tilde.h, readline-6.2/undo.c,
	readline-6.2/util.c, readline-6.2/vi_keymap.c,
	readline-6.2/vi_mode.c, readline-6.2/xfree.c, readline-6.2/xmalloc.c,
	readline-6.2/xmalloc.h, readline-6.2/doc/Makefile.in,
	readline-6.2/doc/fdl.texi, readline-6.2/doc/history.0,
	readline-6.2/doc/history.3, readline-6.2/doc/history.dvi,
	readline-6.2/doc/history.html, readline-6.2/doc/history.info,
	readline-6.2/doc/history.pdf, readline-6.2/doc/history.ps,
	readline-6.2/doc/history.texi, readline-6.2/doc/history_3.ps,
	readline-6.2/doc/hstech.texi, readline-6.2/doc/hsuser.texi,
	readline-6.2/doc/readline.0, readline-6.2/doc/readline.3,
	readline-6.2/doc/readline.dvi, readline-6.2/doc/readline.html,
	readline-6.2/doc/readline.info, readline-6.2/doc/readline.pdf,
	readline-6.2/doc/readline.ps, readline-6.2/doc/readline_3.ps,
	readline-6.2/doc/rlman.texi, readline-6.2/doc/rltech.texi,
	readline-6.2/doc/rluser.texi, readline-6.2/doc/rluserman.dvi,
	readline-6.2/doc/rluserman.html, readline-6.2/doc/rluserman.info,
	readline-6.2/doc/rluserman.pdf, readline-6.2/doc/rluserman.ps,
	readline-6.2/doc/rluserman.texi, readline-6.2/doc/texi2dvi,
	readline-6.2/doc/texi2html, readline-6.2/doc/texinfo.tex,
	readline-6.2/doc/version.texi, readline-6.2/examples/Inputrc,
	readline-6.2/examples/Makefile.in,
	readline-6.2/examples/excallback.c, readline-6.2/examples/fileman.c,
	readline-6.2/examples/histexamp.c, readline-6.2/examples/manexamp.c,
	readline-6.2/examples/readlinebuf.h,
	readline-6.2/examples/rl-fgets.c, readline-6.2/examples/rl.c,
	readline-6.2/examples/rlcat.c, readline-6.2/examples/rlevent.c,
	readline-6.2/examples/rlptytest.c, readline-6.2/examples/rltest.c,
	readline-6.2/examples/rlversion.c,
	readline-6.2/examples/rlwrap-0.30.tar.gz,
	readline-6.2/examples/autoconf/BASH_CHECK_LIB_TERMCAP,
	readline-6.2/examples/autoconf/RL_LIB_READLINE_VERSION,
	readline-6.2/examples/autoconf/wi_LIB_READLINE,
	readline-6.2/examples/rlfe/ChangeLog,
	readline-6.2/examples/rlfe/Makefile.in,
	readline-6.2/examples/rlfe/README,
	readline-6.2/examples/rlfe/config.h.in,
	readline-6.2/examples/rlfe/configure,
	readline-6.2/examples/rlfe/configure.in,
	readline-6.2/examples/rlfe/extern.h, readline-6.2/examples/rlfe/os.h,
	readline-6.2/examples/rlfe/pty.c, readline-6.2/examples/rlfe/rlfe.c,
	readline-6.2/examples/rlfe/screen.h, readline-6.2/shlib/Makefile.in,
	readline-6.2/support/config.guess, readline-6.2/support/config.rpath,
	readline-6.2/support/config.sub, readline-6.2/support/install.sh,
	readline-6.2/support/mkdirs, readline-6.2/support/mkdist,
	readline-6.2/support/mkinstalldirs,
	readline-6.2/support/shlib-install, readline-6.2/support/shobj-conf,
	readline-6.2/support/wcwidth.c: New files.

1 files changed, 337 insertions, 0 deletions

diff --git a/readline-6.2/examples/rlptytest.c b/readline-6.2/examples/rlptytest.c
new file mode 100644
index 0000000..79257db
--- /dev/null
+++ b/readline-6.2/examples/rlptytest.c
@@ -0,0 +1,337 @@
+/*
+ *
+ * Another test harness for the readline callback interface.
+ *
+ * Author: Bob Rossi <bob@brasko.net>
+ */
+
+#if defined (HAVE_CONFIG_H)
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <sys/types.h>
+#include <errno.h>
+#include <curses.h>
+
+#include <stdlib.h>
+#include <unistd.h>
+
+#include <signal.h>
+
+#if 0	/* LINUX */
+#include <pty.h>
+#else
+#include <util.h>
+#endif
+
+#ifdef READLINE_LIBRARY
+#  include "readline.h"
+#else
+#  include <readline/readline.h>
+#endif
+
+/**
+ * Master/Slave PTY used to keep readline off of stdin/stdout.
+ */
+static int masterfd = -1;
+static int slavefd;
+
+void
+sigint (s)
+     int s;
+{
+  tty_reset (STDIN_FILENO);
+  close (masterfd);
+  close (slavefd);
+  printf ("\n");
+  exit (0);
+}
+
+static int 
+user_input()
+{
+  int size;
+  const int MAX = 1024;
+  char *buf = (char *)malloc(MAX+1);
+
+  size = read (STDIN_FILENO, buf, MAX);
+  if (size == -1)
+    return -1;
+
+  size = write (masterfd, buf, size);
+  if (size == -1)
+    return -1;
+
+  return 0;
+}
+
+static int 
+readline_input()
+{
+  const int MAX = 1024;
+  char *buf = (char *)malloc(MAX+1);
+  int size;
+
+  size = read (masterfd, buf, MAX);
+  if (size == -1)
+    {
+      free( buf );
+      buf = NULL;
+      return -1;
+    }
+
+  buf[size] = 0;
+
+  /* Display output from readline */
+  if ( size > 0 )
+    fprintf(stderr, "%s", buf);
+
+  free( buf );
+  buf = NULL;
+  return 0;
+}
+
+static void 
+rlctx_send_user_command(char *line)
+{
+  /* This happens when rl_callback_read_char gets EOF */
+  if ( line == NULL )
+    return;
+    
+  if (strcmp (line, "exit") == 0) {
+  	tty_reset (STDIN_FILENO);
+  	close (masterfd);
+  	close (slavefd);
+  	printf ("\n");
+	exit (0);
+  }
+  
+  /* Don't add the enter command */
+  if ( line && *line != '\0' )
+    add_history(line);
+}
+
+static void 
+custom_deprep_term_function ()
+{
+}
+
+static int 
+init_readline (int inputfd, int outputfd) 
+{
+  FILE *inputFILE, *outputFILE;
+
+  inputFILE = fdopen (inputfd, "r");
+  if (!inputFILE)
+    return -1;
+
+  outputFILE = fdopen (outputfd, "w");
+  if (!outputFILE)
+    return -1;
+
+  rl_instream = inputFILE;
+  rl_outstream = outputFILE;
+
+  /* Tell readline what the prompt is if it needs to put it back */
+  rl_callback_handler_install("(rltest):  ", rlctx_send_user_command);
+
+  /* Set the terminal type to dumb so the output of readline can be
+   * understood by tgdb */
+  if ( rl_reset_terminal("dumb") == -1 )
+    return -1;
+
+  /* For some reason, readline can not deprep the terminal.
+   * However, it doesn't matter because no other application is working on
+   * the terminal besides readline */
+  rl_deprep_term_function = custom_deprep_term_function;
+
+  using_history();
+  read_history(".history"); 
+
+  return 0;
+}
+
+static int 
+main_loop(void)
+{
+  fd_set rset;
+  int max;
+    
+  max = (masterfd > STDIN_FILENO) ? masterfd : STDIN_FILENO;
+  max = (max > slavefd) ? max : slavefd;
+
+  for (;;)
+    {
+      /* Reset the fd_set, and watch for input from GDB or stdin */
+      FD_ZERO(&rset);
+        
+      FD_SET(STDIN_FILENO, &rset);
+      FD_SET(slavefd, &rset);
+      FD_SET(masterfd, &rset);
+
+      /* Wait for input */
+      if (select(max + 1, &rset, NULL, NULL, NULL) == -1)
+        {
+          if (errno == EINTR)
+             continue;
+          else
+            return -1;
+        }
+
+      /* Input received through the pty:  Handle it 
+       * Wrote to masterfd, slave fd has that input, alert readline to read it. 
+       */
+      if (FD_ISSET(slavefd, &rset))
+        rl_callback_read_char();
+
+      /* Input received through the pty.
+       * Readline read from slavefd, and it wrote to the masterfd. 
+       */
+      if (FD_ISSET(masterfd, &rset))
+        if ( readline_input() == -1 )
+          return -1;
+
+      /* Input received:  Handle it, write to masterfd (input to readline) */
+      if (FD_ISSET(STDIN_FILENO, &rset))
+        if ( user_input() == -1 )
+          return -1;
+  }
+
+  return 0;
+}
+
+/* The terminal attributes before calling tty_cbreak */
+static struct termios save_termios;
+static struct winsize size;
+static enum { RESET, TCBREAK } ttystate = RESET;
+
+/* tty_cbreak: Sets terminal to cbreak mode. Also known as noncanonical mode.
+ *    1. Signal handling is still turned on, so the user can still type those.
+ *    2. echo is off
+ *    3. Read in one char at a time.
+ *
+ * fd    - The file descriptor of the terminal
+ * 
+ * Returns: 0 on sucess, -1 on error
+ */
+int tty_cbreak(int fd){
+   struct termios buf;
+    int ttysavefd = -1;
+   
+   if(tcgetattr(fd, &save_termios) < 0)
+      return -1;
+      
+   buf = save_termios;
+   buf.c_lflag &= ~(ECHO | ICANON);
+   buf.c_iflag &= ~(ICRNL | INLCR);
+   buf.c_cc[VMIN] = 1;
+   buf.c_cc[VTIME] = 0;
+
+#if defined (VLNEXT) && defined (_POSIX_VDISABLE)
+   buf.c_cc[VLNEXT] = _POSIX_VDISABLE;
+#endif
+
+#if defined (VDSUSP) && defined (_POSIX_VDISABLE)
+   buf.c_cc[VDSUSP] = _POSIX_VDISABLE;
+#endif
+
+  /* enable flow control; only stty start char can restart output */
+#if 0
+  buf.c_iflag |= (IXON|IXOFF);
+#ifdef IXANY
+  buf.c_iflag &= ~IXANY;
+#endif
+#endif
+
+  /* disable flow control; let ^S and ^Q through to pty */
+  buf.c_iflag &= ~(IXON|IXOFF);
+#ifdef IXANY
+  buf.c_iflag &= ~IXANY;
+#endif
+
+  if(tcsetattr(fd, TCSAFLUSH, &buf) < 0)
+      return -1;
+
+   ttystate = TCBREAK;
+   ttysavefd = fd;
+
+   /* set size */
+   if(ioctl(fd, TIOCGWINSZ, (char *)&size) < 0)
+      return -1;
+
+#ifdef DEBUG
+   err_msg("%d rows and %d cols\n", size.ws_row, size.ws_col);   
+#endif
+   
+   return (0);   
+}
+
+int 
+tty_off_xon_xoff (int fd)
+{
+  struct termios buf;
+  int ttysavefd = -1;
+
+  if(tcgetattr(fd, &buf) < 0)
+    return -1;
+     
+  buf.c_iflag &= ~(IXON|IXOFF);
+
+  if(tcsetattr(fd, TCSAFLUSH, &buf) < 0)
+    return -1;
+
+  return 0;   
+}
+
+/* tty_reset: Sets the terminal attributes back to their previous state.
+ * PRE: tty_cbreak must have already been called.
+ * 
+ * fd    - The file descrioptor of the terminal to reset.
+ * 
+ * Returns: 0 on success, -1 on error
+ */
+int tty_reset(int fd)
+{
+   if(ttystate != TCBREAK)
+      return (0);
+
+   if(tcsetattr(fd, TCSAFLUSH, &save_termios) < 0)
+      return (-1);
+      
+   ttystate = RESET;
+   
+   return 0;   
+}
+
+int 
+main()
+{
+  int val;
+  val = openpty (&masterfd, &slavefd, NULL, NULL, NULL);
+  if (val == -1)
+    return -1;
+
+  val = tty_off_xon_xoff (masterfd);
+  if (val == -1)
+    return -1;
+
+  val = init_readline (slavefd, slavefd);
+  if (val == -1)
+    return -1;
+
+  val = tty_cbreak (STDIN_FILENO);
+  if (val == -1)
+    return -1;
+
+  signal (SIGINT, sigint);
+
+  val = main_loop ();
+
+  tty_reset (STDIN_FILENO);
+
+  if (val == -1)
+    return -1;
+
+  return 0;
+}