commit bash-20191219 snapshot

CWRU/CWRU.chlog

@@ -7040,3 +7040,50 @@ builtins/bind.def
 	  sequences that was bound to execute a shell command. We unbind any
 	  key sequences from the list before the call to rl_parse_and_bind that
 	  don't appear in the list after the call using unbind_unix_command
+
+				   12/19
+				   -----
+include/posixstat.h
+	- added some definitions for MinGW. Report and patch from
+	  Eli Zaretskii <eliz@gnu.org>
+
+				   12/20
+				   -----
+lib/readline/display.c
+	- update_line: when wrapping lines containing multibyte characters at
+	  the wrap point, and the number of screen positions consumed by the
+	  first character on the new line isn't the same as the old line,
+	  make sure we set OE before the `goto dumb_update;' since clearing
+	  the rest of the line may use it. Tentative fix for bug reported by
+	  Kirill Chibisov <wchibisovkirill@gmail.com>
+
+lib/readline/signals.c
+	- _rl_signal_handler: set RL_STATE_SIGHANDLER around SIGWINCH code,
+	  like _rl_handle_signal does
+
+				   12/26
+				   -----
+lib/sh/stringvec.c
+	- strvec_posixcmp: new function that conforms to posix requirement for
+	  sorting globs: perform a bytewise comparison if the two strings
+	  collate equally. Posix interp 963 and 1070
+	- strvec_sort: take a new flags argument, if non-zero use the posix
+	  string comparison function
+
+pathexp.c
+	- shell_glob_filename: call strvec_sort with the flag value to be
+	  posix conformant
+
+lib/sh/stringlist.c
+	- strvec_sort: change callers
+
+				   12/29
+				   -----
+sig.c
+	- throw_to_top_level: set running_trap to 0 after calling run_trap_cleanup.
+	  This avoids spurious (in non-release versions) warnings from
+	  run_pending_traps the next time a trap handler for that signal
+	  runs. Bug report from Martijn Dekker <martijn@inlv.org>
+
+
+	  

doc/bash.1

@@ -10784,7 +10784,7 @@ attribute, \fIname\fP will be unset rather than the variable it
 references.
 \fB\-n\fP has no effect if the \fB\-f\fP option is supplied.
 If no options are supplied, each \fIname\fP refers to a variable; if
-there is no variable by that name, any function with that name is
+there is no variable by that name, a function with that name, if any, is
 unset.
 Each unset variable or function is removed from the environment
 passed to subsequent commands.

doc/bashref.texi

@@ -3952,7 +3952,7 @@ the @var{nameref} attribute, @var{name} will be unset rather than the
 variable it references.
 @option{-n} has no effect if the @option{-f} option is supplied.
 If no options are supplied, each @var{name} refers to a variable; if
-there is no variable by that name, any function with that name is
+there is no variable by that name, a function with that name, if any, is
 unset.
 Readonly variables and functions may not be unset.
 Some shell variables lose their special behavior if they are unset; such
@@ -4600,7 +4600,7 @@ from regular files.
 If @code{read} times out, @code{read} saves any partial input read into
 the specified variable @var{name}.
 If @var{timeout} is 0, @code{read} returns immediately, without trying to
-read and data.  The exit status is 0 if input is available on
+read any data.  The exit status is 0 if input is available on
 the specified file descriptor, non-zero otherwise.
 The exit status is greater than 128 if the timeout is exceeded.
 

externs.h

@@ -405,8 +405,9 @@ extern int strvec_remove __P((char **, char *));
 extern int strvec_len __P((char **));
 extern int strvec_search __P((char **, char *));
 extern char **strvec_copy __P((char **));
+extern int strvec_posixcmp __P((char **, char **));
 extern int strvec_strcmp __P((char **, char **));
-extern void strvec_sort __P((char **));
+extern void strvec_sort __P((char **, int));
 
 extern char **strvec_from_word_list __P((WORD_LIST *, int, int, int *));
 extern WORD_LIST *strvec_to_word_list __P((char **, int, int));

include/posixstat.h

@@ -1,7 +1,7 @@
 /* posixstat.h -- Posix stat(2) definitions for systems that
    don't have them. */
 
-/* Copyright (C) 1987,1991 Free Software Foundation, Inc.
+/* Copyright (C) 1987-2019 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 
@@ -132,6 +132,26 @@
 #  define S_IRWXU	(S_IRUSR | S_IWUSR | S_IXUSR)
 #  define S_IRWXG	(S_IRGRP | S_IWGRP | S_IXGRP)
 #  define S_IRWXO	(S_IROTH | S_IWOTH | S_IXOTH)
+#else /* !S_IRWXU */
+  /* S_IRWXU is defined, but "group" and "other" bits might not be
+     (happens in certain versions of MinGW).  */
+#  if !defined (S_IRGRP)
+#    define S_IRGRP	(S_IREAD  >> 3)		/* read, group */
+#    define S_IWGRP	(S_IWRITE >> 3)		/* write, group */
+#    define S_IXGRP	(S_IEXEC  >> 3)		/* execute, group */
+#  endif /* !S_IRGRP */
+
+#  if !defined (S_IROTH)
+#    define S_IROTH	(S_IREAD  >> 6)		/* read, other */
+#    define S_IWOTH	(S_IWRITE >> 6)		/* write, other */
+#    define S_IXOTH	(S_IEXEC  >> 6)		/* execute, other */
+#  endif /* !S_IROTH */
+#  if !defined (S_IRWXG)
+#    define S_IRWXG	(S_IRGRP | S_IWGRP | S_IXGRP)
+#  endif
+#  if !defined (S_IRWXO)
+#    define S_IRWXO	(S_IROTH | S_IWOTH | S_IXOTH)
+#  endif
 #endif /* !S_IRWXU */
 
 /* These are non-standard, but are used in builtins.c$symbolic_umask() */

lib/readline/bind.c

@@ -788,7 +788,7 @@ _rl_untranslate_macro_value (char *seq, int use_escapes)
 
 /* Return a pointer to the function that STRING represents.
    If STRING doesn't have a matching function, then a NULL pointer
-   is returned. */
+   is returned. The string match is case-insensitive. */
 rl_command_func_t *
 rl_named_function (const char *string)
 {

lib/readline/display.c

@@ -1666,6 +1666,7 @@ update_line (char *old, char *new, int current_line, int omax, int nmax, int inv
 		 and do a dumb update. */
 	      if (newwidth != oldwidth)
 		{
+		  oe = old + omax;
 		  ne = new + nmax;
 		  nd = newbytes;
 		  nfd = new + nd;

lib/readline/funmap.c

@@ -157,7 +157,7 @@ static const FUNMAP default_funmap[] = {
   { "vi-backward-bigword", rl_vi_bWord },
   { "vi-backward-word", rl_vi_bword },
   { "vi-bWord", rl_vi_bWord },
-  { "vi-bword", rl_vi_bword },
+  { "vi-bword", rl_vi_bword },	/* BEWARE: name matching is case insensitive */
   { "vi-change-case", rl_vi_change_case },
   { "vi-change-char", rl_vi_change_char },
   { "vi-change-to", rl_vi_change_to },
@@ -171,13 +171,13 @@ static const FUNMAP default_funmap[] = {
   { "vi-end-bigword", rl_vi_eWord },
   { "vi-end-word", rl_vi_end_word },
   { "vi-eof-maybe", rl_vi_eof_maybe },
-  { "vi-eword", rl_vi_eword },
+  { "vi-eword", rl_vi_eword },	/* BEWARE: name matching is case insensitive */
   { "vi-fWord", rl_vi_fWord },
   { "vi-fetch-history", rl_vi_fetch_history },
   { "vi-first-print", rl_vi_first_print },
   { "vi-forward-bigword", rl_vi_fWord },
   { "vi-forward-word", rl_vi_fword },
-  { "vi-fword", rl_vi_fword },
+  { "vi-fword", rl_vi_fword },	/* BEWARE: name matching is case insensitive */
   { "vi-goto-mark", rl_vi_goto_mark },
   { "vi-insert-beg", rl_vi_insert_beg },
   { "vi-insertion-mode", rl_vi_insert_mode },

lib/readline/signals.c

@@ -144,6 +144,8 @@ _rl_signal_handler (int sig)
 #if defined (SIGWINCH)
   if (sig == SIGWINCH)
     {
+      RL_SETSTATE(RL_STATE_SIGHANDLER);
+
       rl_resize_terminal ();
       /* XXX - experimental for now */
       /* Call a signal hook because though we called the original signal handler
@@ -151,6 +153,8 @@ _rl_signal_handler (int sig)
 	 ourselves. */
       if (rl_signal_event_hook)
 	(*rl_signal_event_hook) ();
+
+      RL_UNSETSTATE(RL_STATE_SIGHANDLER);
     }
   else
 #endif

lib/sh/input_avail.c

@@ -1,7 +1,7 @@
 /* input_avail.c -- check whether or not data is available for reading on a
 		    specified file descriptor. */
 
-/* Copyright (C) 2008,2009 Free Software Foundation, Inc.
+/* Copyright (C) 2008,2009-2019 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 
@@ -33,6 +33,10 @@
 #  include <sys/file.h>
 #endif /* HAVE_SYS_FILE_H */
 
+#if defined (HAVE_PSELECT)
+#  include <signal.h>
+#endif
+
 #if defined (HAVE_UNISTD_H)
 #  include <unistd.h>
 #endif /* HAVE_UNISTD_H */
@@ -82,10 +86,8 @@ input_avail (fd)
   timeout.tv_usec = 0;
   result = select (fd + 1, &readfds, (fd_set *)NULL, &exceptfds, &timeout);
   return ((result <= 0) ? 0 : 1);
-
 #endif
 
-  result = -1;
 #if defined (FIONREAD)
   errno = 0;
   result = ioctl (fd, FIONREAD, &chars_avail);
@@ -96,3 +98,68 @@ input_avail (fd)
 
   return 0;
 }
+
+/* Wait until NCHARS are available for reading on file descriptor FD.
+   This can wait indefinitely. Return -1 on error. */
+int
+nchars_avail (fd, nchars)
+     int fd;
+     int nchars;
+{
+  int result, chars_avail;
+#if defined(HAVE_SELECT)
+  fd_set readfds, exceptfds;
+#endif
+#if defined (HAVE_PSELECT)
+  sigset_t set, oset;
+#endif
+
+  if (fd < 0 || nchars < 0)
+    return -1;
+  if (nchars == 0)
+    return (input_avail (fd));
+
+  chars_avail = 0;
+
+#if defined (HAVE_SELECT)
+  FD_ZERO (&readfds);
+  FD_ZERO (&exceptfds);
+  FD_SET (fd, &readfds);
+  FD_SET (fd, &exceptfds);
+#endif
+#if defined (HAVE_SELECT) || defined (HAVE_PSELECT)
+  sigprocmask (SIG_BLOCK, (sigset_t *)NULL, &set);
+#  ifdef SIGCHLD
+  sigaddset (&set, SIGCHLD);
+#  endif
+  sigemptyset (&oset);
+#endif
+
+  while (1)
+    {
+      result = 0;
+#if defined (HAVE_PSELECT)
+      /* XXX - use pselect(2) to block SIGCHLD atomically */
+      result = pselect (fd + 1, &readfds, (fd_set *)NULL, &exceptfds, (struct timespec *)NULL, &set);
+#elif defined (HAVE_SELECT)
+      sigprocmask (SIG_BLOCK, &set, &oset);
+      result = select (fd + 1, &readfds, (fd_set *)NULL, &exceptfds, (struct timeval *)NULL);
+      sigprocmask (SIG_BLOCK, &oset, (sigset_t *)NULL);
+#endif
+      if (result < 0)
+        return -1;
+
+#if defined (FIONREAD)
+      errno = 0;
+      result = ioctl (fd, FIONREAD, &chars_avail);
+      if (result == -1 && errno == EIO)
+        return -1;
+      if (chars_avail >= nchars)
+        break;
+#else
+      break;
+#endif
+    }
+
+  return 0;
+}

lib/sh/stringlist.c

@@ -1,6 +1,6 @@
 /* stringlist.c - functions to handle a generic `list of strings' structure */
 
-/* Copyright (C) 2000-2002 Free Software Foundation, Inc.
+/* Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 
@@ -255,7 +255,7 @@ strlist_sort (sl)
 {
   if (sl == 0 || sl->list_len == 0 || sl->list == 0)
     return;
-  strvec_sort (sl->list);
+  strvec_sort (sl->list, 0);
 }
 
 STRINGLIST *

lib/sh/stringvec.c

@@ -156,6 +156,28 @@ strvec_copy (array)
   return (ret);
 }
 
+/* Comparison routine for use by qsort that conforms to the new Posix
+   requirements (http://austingroupbugs.net/view.php?id=1070).
+
+   Perform a bytewise comparison if *S1 and *S2 collate equally. */
+int
+strvec_posixcmp (s1, s2)
+     register char **s1, **s2;
+{
+  int result;
+
+#if defined (HAVE_STRCOLL)
+   result = strcoll (*s1, *s2);
+   if (result != 0)
+     return result;
+#endif
+
+  if ((result = **s1 - **s2) == 0)
+    result = strcmp (*s1, *s2);
+
+  return (result);
+}
+
 /* Comparison routine for use with qsort() on arrays of strings.  Uses
    strcoll(3) if available, otherwise it uses strcmp(3). */
 int
@@ -176,10 +198,14 @@ strvec_strcmp (s1, s2)
 
 /* Sort ARRAY, a null terminated array of pointers to strings. */
 void
-strvec_sort (array)
+strvec_sort (array, posix)
      char **array;
+     int posix;
 {
-  qsort (array, strvec_len (array), sizeof (char *), (QSFUNC *)strvec_strcmp);
+  if (posix)
+    qsort (array, strvec_len (array), sizeof (char *), (QSFUNC *)strvec_posixcmp);
+  else
+    qsort (array, strvec_len (array), sizeof (char *), (QSFUNC *)strvec_strcmp);
 }
 
 /* Cons up a new array of words.  The words are taken from LIST,

pathexp.c

@@ -448,7 +448,7 @@ shell_glob_filename (pathname, qflags)
       if (should_ignore_glob_matches ())
 	ignore_glob_matches (results);
       if (results && results[0])
-	strvec_sort (results);
+	strvec_sort (results, 1);		/* posix sort */
       else
 	{
 	  FREE (results);
@@ -475,7 +475,7 @@ shell_glob_filename (pathname, qflags)
       if (should_ignore_glob_matches ())
 	ignore_glob_matches (results);
       if (results && results[0])
-	strvec_sort (results);
+	strvec_sort (results, 1);		/* posix sort */
       else
 	{
 	  FREE (results);

sig.c

@@ -416,7 +416,10 @@ throw_to_top_level ()
     parse_and_execute_cleanup (-1);
 
   if (running_trap > 0)
-    run_trap_cleanup (running_trap - 1);
+    {
+      run_trap_cleanup (running_trap - 1);
+      running_trap = 0;
+    }
 
 #if defined (JOB_CONTROL)
   give_terminal_to (shell_pgrp, 0);