source: patches/bash-4.1-branch_update-2.patch@ abdca7b

bashline.c

@@ -1680 +1680 @@
      a single match (multiple matches that end up reducing the number of
      characters in the common prefix are bad) will ever be returned on
      regular completion. */
-  if (glob_pattern_p (hint))
+  if (globpat)
     {
       if (state == 0)
         {

builtins/declare.def

@@ -512 +512 @@
             {
               /* let bind_{array,assoc}_variable take care of this. */
               if (assoc_p (var))
-                bind_assoc_variable (var, name, "0", value, aflags);
+                bind_assoc_variable (var, name, savestring ("0"), value, aflags);
               else
                 bind_array_variable (name, 0, value, aflags);
             }

builtins/printf.def

@@ -117 +117 @@
     else if (have_fieldwidth) \
       nw = vflag ? vbprintf (f, fieldwidth, func) : printf (f, fieldwidth, func); \
     else if (have_precision) \
-      nw = vflag ? vbprintf (f, precision, func) : printf (f, fieldwidth, func); \
+      nw = vflag ? vbprintf (f, precision, func) : printf (f, precision, func); \
     else \
       nw = vflag ? vbprintf (f, func) : printf (f, func); \
     tw += nw; \
@@ -172 +172 @@
 #endif
 
 #if !HAVE_VSNPRINTF
-extern int vsnprintf __P((char *, size_t, const char *, ...)) __attribute__((__format__ (printf, 3, 4)));
+extern int vsnprintf __P((char *, size_t, const char *, va_list)) __attribute__((__format__ (printf, 3, 0)));
 #endif
 
 static void printf_erange __P((char *));

builtins/read.def

@@ -615 +615 @@
   if (unbuffered_read == 0)
     zsyncfd (fd);
 
-  interrupt_immediately--;
-  terminate_immediately--;
   discard_unwind_frame ("read_builtin");
 
   retval = eof ? EXECUTION_FAILURE : EXECUTION_SUCCESS;
 
 assign_vars:
 
+  interrupt_immediately--;
+  terminate_immediately--;
+
 #if defined (ARRAY_VARS)
   /* If -a was given, take the string read, break it into a list of words,
      an assign them to `arrayname' in turn. */

lib/readline/complete.c

@@ -2138 +2138 @@
          All other entries except "." and ".." match. */
       if (filename_len == 0)
         {
-          if (_rl_match_hidden_files == 0 && HIDDEN_FILE (entry->d_name))
+          if (_rl_match_hidden_files == 0 && HIDDEN_FILE (convfn))
             continue;
 
           if (convfn[0] != '.' ||
@@ -2219 +2219 @@
                 temp[dirlen++] = '/';
             }
 
-          strcpy (temp + dirlen, entry->d_name);
+          strcpy (temp + dirlen, convfn);
         }
       else
         temp = savestring (convfn);

patchlevel.h

@@ -25 +25 @@
    regexp `^#define[    ]*PATCHLEVEL', since that's what support/mkversion.sh
    looks for to find the patch level (for the sccs version string). */
 
-#define PATCHLEVEL 0
+#define PATCHLEVEL 9
 
 #endif /* _PATCHLEVEL_H_ */

print_cmd.c

@@ -113 +113 @@
 
 #define CHECK_XTRACE_FP xtrace_fp = (xtrace_fp ? xtrace_fp : stderr)
 
+#define PRINT_DEFERRED_HEREDOCS(x) \
+  do { \
+    if (deferred_heredocs) \
+      print_deferred_heredocs (x); \
+  } while (0)
+
 /* Non-zero means the stuff being printed is inside of a function def. */
 static int inside_function_def;
 static int skip_this_indent;
@@ -560 +566 @@
      FOR_COM *for_command;
 {
   print_for_command_head (for_command);
-
   cprintf (";");
   newline ("do\n");
+
   indentation += indentation_amount;
   make_command_string_internal (for_command->action);
+  PRINT_DEFERRED_HEREDOCS ("");
   semicolon ();
   indentation -= indentation_amount;
+
   newline ("done");
 }
 

bash-4.1

@@ -655 +655 @@
     act.sa_flags |= SA_INTERRUPT;       /* XXX */
   else
     act.sa_flags |= SA_RESTART;         /* XXX */
+#else
+  if (sig == SIGCHLD)
+    act.sa_flags |= SA_RESTART;
 #endif
   sigemptyset (&act.sa_mask);
   sigemptyset (&oact.sa_mask);

variables.c

@@ -3808 +3808 @@
 
   if (tempvar_p (var) && (posixly_correct || (var->attributes & att_propagate)))
     {
+      /* Make sure we have a hash table to store the variable in while it is
+         being propagated down to the global variables table.  Create one if
+         we have to */
+      if ((vc_isfuncenv (shell_variables) || vc_istempenv (shell_variables)) && shell_variables->table == 0)
+        shell_variables->table = hash_create (0);
       /* XXX - should we set v->context here? */
       v = bind_variable_internal (var->name, value_cell (var), shell_variables->table, 0, 0);
       if (shell_variables == global_variables)