File readline-4.3-input.dif of Package bash - j0ke.net Open Build Service

File readline-4.3-input.dif of Package bash (Revision f36fcf0c0c27a1bcfd3c2e7b0a1c1c4e)

Currently displaying revision f36fcf0c0c27a1bcfd3c2e7b0a1c1c4e, show latest

Index: lib/readline/input.c
===================================================================
--- lib/readline/input.c.orig
+++ lib/readline/input.c
@@ -459,6 +459,8 @@ rl_read_key ()
   return (c);
 }
 
+extern int _rl_read_zero_char_from_tty;
+
 int
 rl_getc (stream)
      FILE *stream;
@@ -482,7 +484,10 @@ rl_getc (stream)
       /* If zero characters are returned, then the file that we are
 	 reading from is empty!  Return EOF in that case. */
       if (result == 0)
-	return (EOF);
+	{
+	  _rl_read_zero_char_from_tty = 1;
+	  return (EOF);
+	}
 
 #if defined (__BEOS__)
       if (errno == EINTR)
Index: lib/readline/readline.c
===================================================================
--- lib/readline/readline.c.orig
+++ lib/readline/readline.c
@@ -469,6 +469,9 @@ _rl_internal_char_cleanup ()
     _rl_erase_entire_line ();
 }
 
+/* Catch EOF from tty, do not return command line */
+int _rl_read_zero_char_from_tty = 0;
+
 STATIC_CALLBACK int
 #if defined (READLINE_CALLBACKS)
 readline_internal_char ()
@@ -513,6 +516,10 @@ readline_internal_charloop ()
       c = rl_read_key ();
       RL_UNSETSTATE(RL_STATE_READCMD);
 
+      /* Return here if terminal is closed */
+      if (c == EOF && _rl_read_zero_char_from_tty)
+	return (rl_done = 1);
+
       /* look at input.c:rl_getc() for the circumstances under which this will
 	 be returned; punt immediately on read error without converting it to
 	 a newline. */