commit bash-20121019 snapshot

lib/glob/glob.c

@@ -86,6 +86,8 @@ struct globval
 extern void throw_to_top_level __P((void));
 extern int sh_eaccess __P((char *, int));
 extern char *sh_makepath __P((const char *, const char *, int));
+extern int signal_is_pending __P((int));
+extern void run_pending_traps __P((void));
 
 extern int extended_glob;
 

lib/sh/strtrans.c

@@ -256,6 +256,7 @@ ansic_quote (str, flags, rlen)
 	default:
 #if defined (HANDLE_MULTIBYTE)
 	  b = is_basic (c);
+	  /* XXX - clen comparison to 0 is dicey */
 	  if ((b == 0 && ((clen = mbrtowc (&wc, s, MB_CUR_MAX, 0)) < 0 || iswprint (wc) == 0)) ||
 	      (b == 1 && ISPRINT (c) == 0))
 #else

lib/sh/tmpfile.c

@@ -31,7 +31,7 @@
 #  include <unistd.h>
 #endif
 
-#include <ansi_stdlib.h>
+#include <bashansi.h>
 
 #include <stdio.h>
 #include <errno.h>

lib/sh/wcsnwidth.c

@@ -39,7 +39,7 @@ wcsnwidth(pwcs, n, max)
   int len, l;
 
   len = 0;
-  ws = pwcs;
+  ws = (wchar_t *)pwcs;
   while (n-- > 0 && (wc = *ws++) != L'\0')
     {
       l = wcwidth (wc);

lib/sh/zread.c

@@ -36,6 +36,8 @@ extern int errno;
 #  define SEEK_CUR 1
 #endif
 
+extern void check_signals_and_traps (void);
+
 /* Read LEN bytes from FD into BUF.  Retry the read on EINTR.  Any other
    error causes the loop to break. */
 ssize_t