[Winbash-checkins] CVS: winbash/lib/readline complete.c,1.3,1.4 history.c,1.2,1.3 signals.c,1.1.1.1,1.2

[kevin s. <xk...@us...>]

Update of /cvsroot/winbash/winbash/lib/readline
In directory usw-pr-cvs1:/tmp/cvs-serv555/lib/readline

Modified Files:
	complete.c history.c signals.c 
Log Message:
applied gnu bash 1.14.6 diffs

Index: complete.c
===================================================================
RCS file: /cvsroot/winbash/winbash/lib/readline/complete.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- complete.c	11 Mar 2002 01:47:04 -0000	1.3
+++ complete.c	11 Mar 2002 04:50:29 -0000	1.4
@@ -491,7 +491,7 @@
 	    }
 	}
 
-      if (rl_point == end && found_quote == 0)
+      if (rl_point == end && quote_char == '\0')
 	{
 	  int quoted = 0;
 	  /* We didn't find an unclosed quoted substring upon which to do
@@ -656,7 +656,16 @@
 	     munge the array, deleting matches as it desires. */
 	  if (rl_ignore_some_completions_function &&
 	      our_func == (Function *)filename_completion_function)
-	    (void)(*rl_ignore_some_completions_function)(matches);
+	    {
+	      (void)(*rl_ignore_some_completions_function)(matches);
+	      if (matches == 0 || matches[0] == 0)
+		{
+		  if (matches)
+		    free (matches);
+		  ding ();
+		  return;
+		}
+	    }
 
 	  /* If we are doing completion on quoted substrings, and any matches
 	     contain any of the completer_word_break_characters, then auto-

Index: history.c
===================================================================
RCS file: /cvsroot/winbash/winbash/lib/readline/history.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- history.c	9 Mar 2002 16:05:43 -0000	1.2
+++ history.c	11 Mar 2002 04:50:30 -0000	1.3
@@ -332,6 +332,8 @@
   reverse = (direction < 0);
 
   /* Take care of trivial cases first. */
+  if (string == 0 || *string == '\0')
+    return (-1);
 
   if (!history_length || ((i == history_length) && !reverse))
     return (-1);

Index: signals.c
===================================================================
RCS file: /cvsroot/winbash/winbash/lib/readline/signals.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- signals.c	9 Mar 2002 03:39:13 -0000	1.1.1.1
+++ signals.c	11 Mar 2002 04:50:30 -0000	1.2
@@ -232,12 +232,12 @@
 {
   old_int = (SigHandler *)rl_set_sighandler (SIGINT, rl_signal_handler);
   if (old_int == (SigHandler *)SIG_IGN)
-    signal (SIGINT, SIG_IGN);
+    rl_set_sighandler (SIGINT, SIG_IGN);
 
 #ifdef SIGALRM
   old_alrm = (SigHandler *)rl_set_sighandler (SIGALRM, rl_signal_handler);
   if (old_alrm == (SigHandler *)SIG_IGN)
-    signal (SIGALRM, SIG_IGN);
+    rl_set_sighandler (SIGALRM, SIG_IGN);
 #endif
 
 #if !defined (SHELL)
@@ -245,7 +245,7 @@
 #if defined (SIGTSTP)
   old_tstp = (SigHandler *)rl_set_sighandler (SIGTSTP, rl_signal_handler);
   if (old_tstp == (SigHandler *)SIG_IGN)
-    signal (SIGTSTP, SIG_IGN);
+    rl_set_sighandler (SIGTSTP, SIG_IGN);
 #endif /* SIGTSTP */
 #if defined (SIGTTOU)
   old_ttou = (SigHandler *)rl_set_sighandler (SIGTTOU, rl_signal_handler);
@@ -253,8 +253,8 @@
 
   if (old_tstp == (SigHandler *)SIG_IGN)
     {
-      signal (SIGTTOU, SIG_IGN);
-      signal (SIGTTIN, SIG_IGN);
+      rl_set_sighandler (SIGTTOU, SIG_IGN);
+      rl_set_sighandler (SIGTTIN, SIG_IGN);
     }
 #endif /* SIGTTOU */