source: patches/bash-4.3-branch_update-2.patch@ 7ea8ad04

arrayfunc.c

@@ -597 +597 @@
       if (assoc_p (var))
         {
           val = expand_assignment_string_to_string (val, 0);
+          if (val == 0)
+            {
+              val = (char *)xmalloc (1);
+              val[0] = '\0';    /* like do_assignment_internal */
+            }
           free_val = 1;
         }
 

externs.h

@@ -324 +324 @@
 extern char *sh_backslash_quote __P((char *, const char *, int));
 extern char *sh_backslash_quote_for_double_quotes __P((char *));
 extern int sh_contains_shell_metas __P((char *));
+extern int sh_contains_quotes __P((char *));
 
 /* declarations for functions defined in lib/sh/spell.c */
 extern int spname __P((char *, char *));

bash-4.3

@@ -4374 +4374 @@
 void
 end_job_control ()
 {
-  if (interactive_shell)                /* XXX - should it be interactive? */
+  if (interactive_shell || job_control)         /* XXX - should it be just job_control? */
     {
       terminate_stopped_jobs ();
 

lib/glob/glob.c

@@ -179 +179 @@
      char *pat, *dname;
      int flags;
 {
-  char *pp, *pe, *t;
-  int n, r;
+  char *pp, *pe, *t, *se;
+  int n, r, negate;
 
+  negate = *pat == '!';
   pp = pat + 2;
-  pe = pp + strlen (pp) - 1;    /*(*/
-  if (*pe != ')')
-    return 0;
-  if ((t = strchr (pp, '|')) == 0)      /* easy case first */
+  se = pp + strlen (pp) - 1;            /* end of string */
+  pe = glob_patscan (pp, se, 0);        /* end of extglob pattern (( */
+  /* we should check for invalid extglob pattern here */
+  /* if pe != se we have more of the pattern at the end of the extglob
+     pattern. Check the easy case first ( */
+  if (pe == se && *pe == ')' && (t = strchr (pp, '|')) == 0)
     {
       *pe = '\0';
+#if defined (HANDLE_MULTIBYTE)
+      r = mbskipname (pp, dname, flags);
+#else
       r = skipname (pp, dname, flags);  /*(*/
+#endif
       *pe = ')';
       return r;
     }
+
+  /* check every subpattern */
   while (t = glob_patscan (pp, pe, '|'))
     {
       n = t[-1];
       t[-1] = '\0';
+#if defined (HANDLE_MULTIBYTE)
+      r = mbskipname (pp, dname, flags);
+#else
       r = skipname (pp, dname, flags);
+#endif
       t[-1] = n;
       if (r == 0)       /* if any pattern says not skip, we don't skip */
         return r;
       pp = t;
     }   /*(*/
 
-  if (pp == pe)         /* glob_patscan might find end of pattern */
+  /* glob_patscan might find end of pattern */
+  if (pp == se)
     return r;
 
-  *pe = '\0';
-#  if defined (HANDLE_MULTIBYTE)
-  r = mbskipname (pp, dname, flags);    /*(*/
-#  else
-  r = skipname (pp, dname, flags);      /*(*/
-#  endif
-  *pe = ')';
-  return r;
+  /* but if it doesn't then we didn't match a leading dot */
+  return 0;
 }
 #endif
 
@@ -277 +285 @@
      int flags;
 {
 #if EXTENDED_GLOB
-  wchar_t *pp, *pe, *t, n;
-  int r;
+  wchar_t *pp, *pe, *t, n, *se;
+  int r, negate;
 
+  negate = *pat == L'!';
   pp = pat + 2;
-  pe = pp + wcslen (pp) - 1;    /*(*/
-  if (*pe != L')')
-    return 0;
-  if ((t = wcschr (pp, L'|')) == 0)
+  se = pp + wcslen (pp) - 1;    /*(*/
+  pe = glob_patscan_wc (pp, se, 0);
+
+  if (pe == se && *pe == ')' && (t = wcschr (pp, L'|')) == 0)
     {
       *pe = L'\0';
       r = wchkname (pp, dname); /*(*/
       *pe = L')';
       return r;
     }
+
+  /* check every subpattern */
   while (t = glob_patscan_wc (pp, pe, '|'))
     {
       n = t[-1];
@@ -305 +316 @@
   if (pp == pe)         /* glob_patscan_wc might find end of pattern */
     return r;
 
-  *pe = L'\0';
-  r = wchkname (pp, dname);     /*(*/
-  *pe = L')';
-  return r;
+  /* but if it doesn't then we didn't match a leading dot */
+  return 0;
 #else
   return (wchkname (pat, dname));
 #endif

lib/glob/gmisc.c

@@ -210 +210 @@
     case '+':
     case '!':
     case '@':
+    case '?':
       return (pat[1] == LPAREN);
     default:
       return 0;

lib/readline/display.c

@@ -2677 +2677 @@
 {
   if (_rl_echoing_p)
     {
-      _rl_move_vert (_rl_vis_botlin);
+      if (_rl_vis_botlin > 0)   /* minor optimization plus bug fix */
+        _rl_move_vert (_rl_vis_botlin);
       _rl_vis_botlin = 0;
       fflush (rl_outstream);
       rl_restart_output (1, 0);

lib/readline/readline.c

@@ -744 +744 @@
     r = _rl_subseq_result (r, cxt->oldmap, cxt->okey, (cxt->flags & KSEQ_SUBSEQ));
 
   RL_CHECK_SIGNALS ();
-  if (r == 0)                   /* success! */
+  /* We only treat values < 0 specially to simulate recursion. */
+  if (r >= 0 || (r == -1 && (cxt->flags & KSEQ_SUBSEQ) == 0))   /* success! or failure! */
     {
       _rl_keyseq_chain_dispose ();
       RL_UNSETSTATE (RL_STATE_MULTIKEY);
@@ -964 +965 @@
 #if defined (VI_MODE)
   if (rl_editing_mode == vi_mode && _rl_keymap == vi_movement_keymap &&
       key != ANYOTHERKEY &&
-      rl_key_sequence_length == 1 &&    /* XXX */
+      _rl_dispatching_keymap == vi_movement_keymap &&
       _rl_vi_textmod_command (key))
     _rl_vi_set_last (key, rl_numeric_arg, rl_arg_sign);
 #endif

lib/sh/shquote.c

@@ -311 +311 @@
 
   return (0);
 }
+
+int
+sh_contains_quotes (string)
+     char *string;
+{
+  char *s;
+
+  for (s = string; s && *s; s++)
+    {
+      if (*s == '\'' || *s == '"' || *s == '\\')
+        return 1;
+    }
+  return 0;
+}

parse.y

@@ -2424 +2424 @@
          not already end in an EOF character.  */
       if (shell_input_line_terminator != EOF)
         {
-          if (shell_input_line_size < SIZE_MAX && shell_input_line_len > shell_input_line_size - 3)
+          if (shell_input_line_size < SIZE_MAX-3 && (shell_input_line_len+3 > shell_input_line_size))
             shell_input_line = (char *)xrealloc (shell_input_line,
                                         1 + (shell_input_line_size += 2));
 
@@ -3398 +3398 @@
          within a double-quoted ${...} construct "an even number of
          unescaped double-quotes or single-quotes, if any, shall occur." */
       /* This was changed in Austin Group Interp 221 */
-      if MBTEST(posixly_correct && shell_compatibility_level > 41 && dolbrace_state != DOLBRACE_QUOTE && (flags & P_DQUOTE) && (flags & P_DOLBRACE) && ch == '\'')
+      if MBTEST(posixly_correct && shell_compatibility_level > 41 && dolbrace_state != DOLBRACE_QUOTE && dolbrace_state != DOLBRACE_QUOTE2 && (flags & P_DQUOTE) && (flags & P_DOLBRACE) && ch == '\'')
         continue;
 
       /* Could also check open == '`' if we want to parse grouping constructs

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 11
 
 #endif /* _PATCHLEVEL_H_ */

pcomplete.c

@@ -183 +183 @@
 
 COMPSPEC *pcomp_curcs;
 const char *pcomp_curcmd;
+const char *pcomp_curtxt;
 
 #ifdef DEBUG
 /* Debugging code */
@@ -753 +754 @@
              quoted strings. */
           dfn = (*rl_filename_dequoting_function) ((char *)text, rl_completion_quote_character);
         }
+      /* Intended to solve a mismatched assumption by bash-completion.  If
+         the text to be completed is empty, but bash-completion turns it into
+         a quoted string ('') assuming that this code will dequote it before
+         calling readline, do the dequoting. */
+      else if (iscompgen && iscompleting &&
+               pcomp_curtxt && *pcomp_curtxt == 0 &&
+               text && (*text == '\'' || *text == '"') && text[1] == text[0] && text[2] == 0 && 
+               rl_filename_dequoting_function)
+        dfn = (*rl_filename_dequoting_function) ((char *)text, rl_completion_quote_character);
+      /* Another mismatched assumption by bash-completion.  If compgen is being
+         run as part of bash-completion, and the argument to compgen is not
+         the same as the word originally passed to the programmable completion
+         code, dequote the argument if it has quote characters.  It's an
+         attempt to detect when bash-completion is quoting its filename
+         argument before calling compgen. */
+      /* We could check whether gen_shell_function_matches is in the call
+         stack by checking whether the gen-shell-function-matches tag is in
+         the unwind-protect stack, but there's no function to do that yet.
+         We could simply check whether we're executing in a function by
+         checking variable_context, and may end up doing that. */
+      else if (iscompgen && iscompleting && rl_filename_dequoting_function &&
+               pcomp_curtxt && text &&
+               STREQ (pcomp_curtxt, text) == 0 &&
+               variable_context &&
+               sh_contains_quotes (text))       /* guess */
+        dfn = (*rl_filename_dequoting_function) ((char *)text, rl_completion_quote_character);
       else
         dfn = savestring (text);
     }
@@ -1522 +1549 @@
      COMPSPEC **lastcs;
 {
   COMPSPEC *cs, *oldcs;
-  const char *oldcmd;
+  const char *oldcmd, *oldtxt;
   STRINGLIST *ret;
 
   cs = progcomp_search (ocmd);
@@ -1545 +1572 @@
 
   oldcs = pcomp_curcs;
   oldcmd = pcomp_curcmd;
+  oldtxt = pcomp_curtxt;
 
   pcomp_curcs = cs;
   pcomp_curcmd = cmd;
+  pcomp_curtxt = word;
 
   ret = gen_compspec_completions (cs, cmd, word, start, end, foundp);
 
   pcomp_curcs = oldcs;
   pcomp_curcmd = oldcmd;
+  pcomp_curtxt = oldtxt;
 
   /* We need to conditionally handle setting *retryp here */
   if (retryp)

bash-4.3

@@ -646 +646 @@
       return (v && invisible_p (v) == 0 && var_isset (v) ? TRUE : FALSE);
 
     case 'R':
-      v = find_variable (arg);
-      return (v && invisible_p (v) == 0 && var_isset (v) && nameref_p (v) ? TRUE : FALSE);
+      v = find_variable_noref (arg);
+      return ((v && invisible_p (v) == 0 && var_isset (v) && nameref_p (v)) ? TRUE : FALSE);
     }
 
   /* We can't actually get here, but this shuts up gcc. */
@@ -723 +723 @@
     case 'o': case 'p': case 'r': case 's': case 't':
     case 'u': case 'v': case 'w': case 'x': case 'z':
     case 'G': case 'L': case 'O': case 'S': case 'N':
+    case 'R':
       return (1);
     }
 

bash-4.3

@@ -920 +920 @@
       subst_assign_varlist = 0;
 
 #if defined (JOB_CONTROL)
-      save_pipeline (1);        /* XXX only provides one save level */
+      if (sig != DEBUG_TRAP)    /* run_debug_trap does this */
+        save_pipeline (1);      /* XXX only provides one save level */
 #endif
 
       /* If we're in a function, make sure return longjmps come here, too. */
@@ -940 +941 @@
       trap_exit_value = last_command_exit_value;
 
 #if defined (JOB_CONTROL)
-      restore_pipeline (1);
+      if (sig != DEBUG_TRAP)    /* run_debug_trap does this */
+        restore_pipeline (1);
 #endif
 
       subst_assign_varlist = save_subst_varlist;

y.tab.c

@@ -4736 +4736 @@
          not already end in an EOF character.  */
       if (shell_input_line_terminator != EOF)
         {
-          if (shell_input_line_size < SIZE_MAX && shell_input_line_len > shell_input_line_size - 3)
+          if (shell_input_line_size < SIZE_MAX-3 && (shell_input_line_len+3 > shell_input_line_size))
             shell_input_line = (char *)xrealloc (shell_input_line,
                                         1 + (shell_input_line_size += 2));
 
@@ -5710 +5710 @@
          within a double-quoted ${...} construct "an even number of
          unescaped double-quotes or single-quotes, if any, shall occur." */
       /* This was changed in Austin Group Interp 221 */
-      if MBTEST(posixly_correct && shell_compatibility_level > 41 && dolbrace_state != DOLBRACE_QUOTE && (flags & P_DQUOTE) && (flags & P_DOLBRACE) && ch == '\'')
+      if MBTEST(posixly_correct && shell_compatibility_level > 41 && dolbrace_state != DOLBRACE_QUOTE && dolbrace_state != DOLBRACE_QUOTE2 && (flags & P_DQUOTE) && (flags & P_DOLBRACE) && ch == '\'')
         continue;
 
       /* Could also check open == '`' if we want to parse grouping constructs