deleted file mode 100644

@@ -1,2631 +0,0 @@

-Submitted By:            Bruce Dubbs <bdubbs_at_linuxfromscratch_dot_org>

-Updated By:              Armin K. <krejzi at email dot com>

-Date:                    2014-10-11

-Initial Package Version: 4.3

-Upstream Status:         Already in upstream patch repo

-Origin:                  Upstream

-Description:             This patch contains upstream patch numbers 001 thru 030

-                         and fixes for CVE-2014-6271, CVE-2014-6277, CVE-2014-6278,

-                         CVE-2014-7169, and CVE-2014-7187

-

-+++ b/arrayfunc.c	2014-10-11 10:34:38.173610936 +0200

-@@ -179,6 +179,7 @@

-     array_insert (array_cell (entry), ind, newval);

-   FREE (newval);

- 

-+  VUNSETATTR (entry, att_invisible);	/* no longer invisible */

-   return (entry);

- }

- 

-@@ -597,6 +598,11 @@

-       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;

- 	}

- 

-+++ b/bashline.c	2014-10-11 10:34:38.173610936 +0200

-@@ -4167,9 +4167,16 @@

-   int qc;

- 

-   qc = rl_dispatching ? rl_completion_quote_character : 0;  

--  dfn = bash_dequote_filename ((char *)text, qc);

-+  /* If rl_completion_found_quote != 0, rl_completion_matches will call the

-+     filename dequoting function, causing the directory name to be dequoted

-+     twice. */

-+  if (rl_dispatching && rl_completion_found_quote == 0)

-+    dfn = bash_dequote_filename ((char *)text, qc);

-+  else

-+    dfn = (char *)text;

-   m1 = rl_completion_matches (dfn, rl_filename_completion_function);

--  free (dfn);

-+  if (dfn != text)

-+    free (dfn);

- 

-   if (m1 == 0 || m1[0] == 0)

-     return m1;

-+++ b/builtins/common.h	2014-10-11 10:34:38.174610956 +0200

-@@ -33,6 +33,8 @@

- #define SEVAL_RESETLINE	0x010

- #define SEVAL_PARSEONLY	0x020

- #define SEVAL_NOLONGJMP 0x040

-+#define SEVAL_FUNCDEF	0x080		/* only allow function definitions */

-+#define SEVAL_ONECMD	0x100		/* only allow a single command */

- 

- /* Flags for describe_command, shared between type.def and command.def */

- #define CDESC_ALL		0x001	/* type -a */

-+++ b/builtins/evalstring.c	2014-10-11 10:37:09.625510026 +0200

-@@ -308,6 +308,27 @@

- 	    {

- 	      struct fd_bitmap *bitmap;

- 

-+	      if (flags & SEVAL_FUNCDEF)

-+		{

-+		  char *x;

-+

-+		  /* If the command parses to something other than a straight

-+		     function definition, or if we have not consumed the entire

-+		     string, or if the parser has transformed the function

-+		     name (as parsing will if it begins or ends with shell

-+		     whitespace, for example), reject the attempt */

-+		  if (command->type != cm_function_def ||

-+		      ((x = parser_remaining_input ()) && *x) ||

-+		      (STREQ (from_file, command->value.Function_def->name->word) == 0))

-+		    {

-+		      internal_warning (_("%s: ignoring function definition attempt"), from_file);

-+		      should_jump_to_top_level = 0;

-+		      last_result = last_command_exit_value = EX_BADUSAGE;

-+		      reset_parser ();

-+		      break;

-+		    }

-+		}

-+

- 	      bitmap = new_fd_bitmap (FD_BITMAP_SIZE);

- 	      begin_unwind_frame ("pe_dispose");

- 	      add_unwind_protect (dispose_fd_bitmap, bitmap);

-@@ -368,6 +389,12 @@

- 	      dispose_command (command);

- 	      dispose_fd_bitmap (bitmap);

- 	      discard_unwind_frame ("pe_dispose");

-+

-+	      if (flags & SEVAL_ONECMD)

-+		{

-+		  reset_parser ();

-+		  break;

-+		}

- 	    }

- 	}

-       else

-+++ b/builtins/read.def	2014-10-11 10:34:38.174610956 +0200

-@@ -442,7 +442,10 @@

-       add_unwind_protect (reset_alarm, (char *)NULL);

- #if defined (READLINE)

-       if (edit)

--	add_unwind_protect (reset_attempted_completion_function, (char *)NULL);

-+	{

-+	  add_unwind_protect (reset_attempted_completion_function, (char *)NULL);

-+	  add_unwind_protect (bashline_reset_event_hook, (char *)NULL);

-+	}

- #endif

-       falarm (tmsec, tmusec);

-     }

-@@ -1021,6 +1024,7 @@

- 

-   old_attempted_completion_function = rl_attempted_completion_function;

-   rl_attempted_completion_function = (rl_completion_func_t *)NULL;

-+  bashline_set_event_hook ();

-   if (itext)

-     {

-       old_startup_hook = rl_startup_hook;

-@@ -1032,6 +1036,7 @@

- 

-   rl_attempted_completion_function = old_attempted_completion_function;

-   old_attempted_completion_function = (rl_completion_func_t *)NULL;

-+  bashline_reset_event_hook ();

- 

-   if (ret == 0)

-     return ret;

-+++ b/copy_cmd.c	2014-10-11 10:34:38.174610956 +0200

-@@ -126,7 +126,7 @@

-     {

-     case r_reading_until:

-     case r_deblank_reading_until:

--      new_redirect->here_doc_eof = savestring (redirect->here_doc_eof);

-+      new_redirect->here_doc_eof = redirect->here_doc_eof ? savestring (redirect->here_doc_eof) : 0;

-       /*FALLTHROUGH*/

-     case r_reading_string:

-     case r_appending_to:

-+++ b/execute_cmd.c	2014-10-11 10:34:38.175610976 +0200

-@@ -2409,7 +2409,16 @@

- #endif

-       lstdin = wait_for (lastpid);

- #if defined (JOB_CONTROL)

--      exec_result = job_exit_status (lastpipe_jid);

-+      /* If wait_for removes the job from the jobs table, use result of last

-+	 command as pipeline's exit status as usual.  The jobs list can get

-+	 frozen and unfrozen at inconvenient times if there are multiple pipelines

-+	 running simultaneously. */

-+      if (INVALID_JOB (lastpipe_jid) == 0)

-+	exec_result = job_exit_status (lastpipe_jid);

-+      else if (pipefail_opt)

-+	exec_result = exec_result | lstdin;	/* XXX */

-+      /* otherwise we use exec_result */

-+        

- #endif

-       unfreeze_jobs_list ();

-     }

-+++ b/externs.h	2014-10-11 10:34:38.175610976 +0200

-@@ -324,6 +324,7 @@

- 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 *));

-+++ b/jobs.c	2014-10-11 10:34:38.176610995 +0200

-@@ -3597,6 +3597,7 @@

-   unwind_protect_int (jobs_list_frozen);

-   unwind_protect_pointer (the_pipeline);

-   unwind_protect_pointer (subst_assign_varlist);

-+  unwind_protect_pointer (this_shell_builtin);

- 

-   /* We have to add the commands this way because they will be run

-      in reverse order of adding.  We don't want maybe_set_sigchld_trap ()

-@@ -4374,7 +4375,7 @@

- 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 ();

- 

-+++ b/lib/glob/glob.c	2014-10-11 10:34:38.176610995 +0200

-@@ -123,6 +123,8 @@

- extern char *glob_patscan __P((char *, char *, int));

- extern wchar_t *glob_patscan_wc __P((wchar_t *, wchar_t *, int));

- 

-+extern char *glob_dirscan __P((char *, int));

-+

- /* Compile `glob_loop.c' for single-byte characters. */

- #define CHAR	unsigned char

- #define INT	int

-@@ -179,42 +181,53 @@

-      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 != ')')

-+  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 == 0)

-     return 0;

--  if ((t = strchr (pp, '|')) == 0)	/* easy case first */

-+

-+  /* 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,20 +290,23 @@

-      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,10 +321,8 @@

-   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

-@@ -1006,7 +1020,7 @@

- {

-   char **result;

-   unsigned int result_size;

--  char *directory_name, *filename, *dname;

-+  char *directory_name, *filename, *dname, *fn;

-   unsigned int directory_len;

-   int free_dirname;			/* flag */

-   int dflags;

-@@ -1022,6 +1036,18 @@

- 

-   /* Find the filename.  */

-   filename = strrchr (pathname, '/');

-+#if defined (EXTENDED_GLOB)

-+  if (filename && extended_glob)

-+    {

-+      fn = glob_dirscan (pathname, '/');

-+#if DEBUG_MATCHING

-+      if (fn != filename)

-+	fprintf (stderr, "glob_filename: glob_dirscan: fn (%s) != filename (%s)\n", fn ? fn : "(null)", filename);

-+#endif

-+      filename = fn;

-+    }

-+#endif

-+

-   if (filename == NULL)

-     {

-       filename = pathname;

-+++ b/lib/glob/gmisc.c	2014-10-11 10:34:38.176610995 +0200

-@@ -42,6 +42,8 @@

- #define WLPAREN         L'('

- #define WRPAREN         L')'

- 

-+extern char *glob_patscan __P((char *, char *, int));

-+

- /* Return 1 of the first character of WSTRING could match the first

-    character of pattern WPAT.  Wide character version. */

- int

-@@ -210,6 +212,7 @@

-     case '+':

-     case '!':

-     case '@':

-+    case '?':

-       return (pat[1] == LPAREN);

-     default:

-       return 0;

-@@ -374,3 +377,34 @@

- 

-   return matlen;

- }

-+

-+/* Skip characters in PAT and return the final occurrence of DIRSEP.  This

-+   is only called when extended_glob is set, so we have to skip over extglob

-+   patterns x(...) */

-+char *

-+glob_dirscan (pat, dirsep)

-+     char *pat;

-+     int dirsep;

-+{

-+  char *p, *d, *pe, *se;

-+

-+  d = pe = se = 0;

-+  for (p = pat; p && *p; p++)

-+    {

-+      if (extglob_pattern_p (p))

-+	{

-+	  if (se == 0)

-+	    se = p + strlen (p) - 1;

-+	  pe = glob_patscan (p + 2, se, 0);

-+	  if (pe == 0)

-+	    continue;

-+	  else if (*pe == 0)

-+	    break;

-+	  p = pe - 1;	/* will do increment above */

-+	  continue;

-+	}

-+      if (*p ==  dirsep)

-+	d = p;

-+    }

-+  return d;

-+}

-+++ b/lib/readline/display.c	2014-10-11 10:34:38.177611015 +0200

-@@ -1637,7 +1637,7 @@

-   /* If we are changing the number of invisible characters in a line, and

-      the spot of first difference is before the end of the invisible chars,

-      lendiff needs to be adjusted. */

--  if (current_line == 0 && !_rl_horizontal_scroll_mode &&

-+  if (current_line == 0 && /* !_rl_horizontal_scroll_mode && */

-       current_invis_chars != visible_wrap_offset)

-     {

-       if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)

-@@ -1825,8 +1825,13 @@

- 	      else

- 		_rl_last_c_pos += bytes_to_insert;

- 

-+	      /* XXX - we only want to do this if we are at the end of the line

-+		 so we move there with _rl_move_cursor_relative */

- 	      if (_rl_horizontal_scroll_mode && ((oe-old) > (ne-new)))

--		goto clear_rest_of_line;

-+		{

-+		  _rl_move_cursor_relative (ne-new, new);

-+		  goto clear_rest_of_line;

-+		}

- 	    }

- 	}

-       /* Otherwise, print over the existing material. */

-@@ -2677,7 +2682,8 @@

- {

-   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);

-+++ b/lib/readline/input.c	2014-10-11 10:34:38.177611015 +0200

-@@ -534,8 +534,16 @@

- 	return (RL_ISSTATE (RL_STATE_READCMD) ? READERR : EOF);

-       else if (_rl_caught_signal == SIGHUP || _rl_caught_signal == SIGTERM)

- 	return (RL_ISSTATE (RL_STATE_READCMD) ? READERR : EOF);

-+      /* keyboard-generated signals of interest */

-       else if (_rl_caught_signal == SIGINT || _rl_caught_signal == SIGQUIT)

-         RL_CHECK_SIGNALS ();

-+      /* non-keyboard-generated signals of interest */

-+      else if (_rl_caught_signal == SIGALRM

-+#if defined (SIGVTALRM)

-+		|| _rl_caught_signal == SIGVTALRM

-+#endif

-+	      )

-+        RL_CHECK_SIGNALS ();

- 

-       if (rl_signal_event_hook)

- 	(*rl_signal_event_hook) ();

-+++ b/lib/readline/misc.c	2014-10-11 10:34:38.177611015 +0200

-@@ -461,6 +461,7 @@

- 	    saved_undo_list = 0;

- 	  /* Set up rl_line_buffer and other variables from history entry */

- 	  rl_replace_from_history (entry, 0);	/* entry->line is now current */

-+	  entry->data = 0;			/* entry->data is now current undo list */

- 	  /* Undo all changes to this history entry */

- 	  while (rl_undo_list)

- 	    rl_do_undo ();

-@@ -468,7 +469,6 @@

- 	     the timestamp. */

- 	  FREE (entry->line);

- 	  entry->line = savestring (rl_line_buffer);

--	  entry->data = 0;

- 	}

-       entry = previous_history ();

-     }

-+++ b/lib/readline/readline.c	2014-10-11 10:34:38.177611015 +0200

-@@ -744,7 +744,8 @@

-     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,7 +965,7 @@

- #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

-+++ b/lib/sh/shquote.c	2014-10-11 10:34:38.177611015 +0200

-@@ -311,3 +311,17 @@

- 

-   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;

-+}

-+++ b/make_cmd.c	2014-10-11 10:34:38.178611034 +0200

-@@ -692,6 +692,7 @@

-   /* First do the common cases. */

-   temp->redirector = source;

-   temp->redirectee = dest_and_filename;

-+  temp->here_doc_eof = 0;

-   temp->instruction = instruction;

-   temp->flags = 0;

-   temp->rflags = flags;

-+++ b/parse.y	2014-10-11 10:37:09.626510045 +0200

-@@ -168,6 +168,9 @@

- 

- static int reserved_word_acceptable __P((int));

- static int yylex __P((void));

-+

-+static void push_heredoc __P((REDIRECT *));

-+static char *mk_alexpansion __P((char *));

- static int alias_expand_token __P((char *));

- static int time_command_acceptable __P((void));

- static int special_case_tokens __P((char *));

-@@ -265,7 +268,9 @@

- 

- /* Variables to manage the task of reading here documents, because we need to

-    defer the reading until after a complete command has been collected. */

--static REDIRECT *redir_stack[10];

-+#define HEREDOC_MAX 16

-+

-+static REDIRECT *redir_stack[HEREDOC_MAX];

- int need_here_doc;

- 

- /* Where shell input comes from.  History expansion is performed on each

-@@ -307,7 +312,7 @@

-    or `for WORD' begins.  This is a nested command maximum, since the array

-    index is decremented after a case, select, or for command is parsed. */

- #define MAX_CASE_NEST	128

--static int word_lineno[MAX_CASE_NEST];

-+static int word_lineno[MAX_CASE_NEST+1];

- static int word_top = -1;

- 

- /* If non-zero, it is the token that we want read_token to return

-@@ -520,42 +525,42 @@

- 			  source.dest = 0;

- 			  redir.filename = $2;

- 			  $$ = make_redirection (source, r_reading_until, redir, 0);

--			  redir_stack[need_here_doc++] = $$;

-+			  push_heredoc ($$);

- 			}

- 	|	NUMBER LESS_LESS WORD

- 			{

- 			  source.dest = $1;

- 			  redir.filename = $3;

- 			  $$ = make_redirection (source, r_reading_until, redir, 0);

--			  redir_stack[need_here_doc++] = $$;

-+			  push_heredoc ($$);

- 			}

- 	|	REDIR_WORD LESS_LESS WORD

- 			{

- 			  source.filename = $1;

- 			  redir.filename = $3;

- 			  $$ = make_redirection (source, r_reading_until, redir, REDIR_VARASSIGN);

--			  redir_stack[need_here_doc++] = $$;

-+			  push_heredoc ($$);

- 			}

- 	|	LESS_LESS_MINUS WORD

- 			{

- 			  source.dest = 0;

- 			  redir.filename = $2;

- 			  $$ = make_redirection (source, r_deblank_reading_until, redir, 0);

--			  redir_stack[need_here_doc++] = $$;

-+			  push_heredoc ($$);

- 			}

- 	|	NUMBER LESS_LESS_MINUS WORD

- 			{

- 			  source.dest = $1;

- 			  redir.filename = $3;

- 			  $$ = make_redirection (source, r_deblank_reading_until, redir, 0);

--			  redir_stack[need_here_doc++] = $$;

-+			  push_heredoc ($$);

- 			}

- 	|	REDIR_WORD  LESS_LESS_MINUS WORD

- 			{

- 			  source.filename = $1;

- 			  redir.filename = $3;

- 			  $$ = make_redirection (source, r_deblank_reading_until, redir, REDIR_VARASSIGN);

--			  redir_stack[need_here_doc++] = $$;

-+			  push_heredoc ($$);

- 			}

- 	|	LESS_LESS_LESS WORD

- 			{

-@@ -2424,7 +2429,7 @@

- 	 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));

- 

-@@ -2533,6 +2538,16 @@

-     eol_ungetc_lookahead = c;

- }

- 

-+char *

-+parser_remaining_input ()

-+{

-+  if (shell_input_line == 0)

-+    return 0;

-+  if (shell_input_line_index < 0 || shell_input_line_index >= shell_input_line_len)

-+    return '\0';	/* XXX */

-+  return (shell_input_line + shell_input_line_index);

-+}

-+

- #ifdef INCLUDE_UNUSED

- /* Back the input pointer up by one, effectively `ungetting' a character. */

- static void

-@@ -2636,13 +2651,28 @@

-    which allow ESAC to be the next one read. */

- static int esacs_needed_count;

- 

-+static void

-+push_heredoc (r)

-+     REDIRECT *r;

-+{

-+  if (need_here_doc >= HEREDOC_MAX)

-+    {

-+      last_command_exit_value = EX_BADUSAGE;

-+      need_here_doc = 0;

-+      report_syntax_error (_("maximum here-document count exceeded"));

-+      reset_parser ();

-+      exit_shell (last_command_exit_value);

-+    }

-+  redir_stack[need_here_doc++] = r;

-+}

-+

- void

- gather_here_documents ()

- {

-   int r;

- 

-   r = 0;

--  while (need_here_doc)

-+  while (need_here_doc > 0)

-     {

-       parser_state |= PST_HEREDOC;

-       make_here_document (redir_stack[r++], line_number);

-@@ -2953,6 +2983,8 @@

-   FREE (word_desc_to_read);

-   word_desc_to_read = (WORD_DESC *)NULL;

- 

-+  eol_ungetc_lookahead = 0;

-+

-   current_token = '\n';		/* XXX */

-   last_read_token = '\n';

-   token_to_read = '\n';

-@@ -3398,7 +3430,7 @@

-          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

-@@ -4005,8 +4037,8 @@

-   reset_parser ();

-   /* reset_parser clears shell_input_line and associated variables */

-   restore_input_line_state (&ls);

--  if (interactive)

--    token_to_read = 0;

-+

-+  token_to_read = 0;

- 

-   /* Need to find how many characters parse_and_execute consumed, update

-      *indp, if flags != 0, copy the portion of the string parsed into RET

-@@ -6075,6 +6107,7 @@

- 

-   ps->expand_aliases = expand_aliases;

-   ps->echo_input_at_read = echo_input_at_read;

-+  ps->need_here_doc = need_here_doc;

- 

-   ps->token = token;

-   ps->token_buffer_size = token_buffer_size;

-@@ -6123,6 +6156,7 @@

- 

-   expand_aliases = ps->expand_aliases;

-   echo_input_at_read = ps->echo_input_at_read;

-+  need_here_doc = ps->need_here_doc;

- 

-   FREE (token);

-   token = ps->token;

-+++ b/patchlevel.h	2014-10-11 10:37:09.628510082 +0200

-@@ -25,6 +25,6 @@

-    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 30

- 

- #endif /* _PATCHLEVEL_H_ */

-+++ b/pcomplete.c	2014-10-11 10:34:38.179611054 +0200

-@@ -183,6 +183,7 @@

- 

- COMPSPEC *pcomp_curcs;

- const char *pcomp_curcmd;

-+const char *pcomp_curtxt;

- 

- #ifdef DEBUG

- /* Debugging code */

-@@ -753,6 +754,32 @@

- 	     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,7 +1549,7 @@

-      COMPSPEC **lastcs;

- {

-   COMPSPEC *cs, *oldcs;

--  const char *oldcmd;

-+  const char *oldcmd, *oldtxt;

-   STRINGLIST *ret;

- 

-   cs = progcomp_search (ocmd);

-@@ -1545,14 +1572,17 @@

- 

-   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)

-+++ b/shell.h	2014-10-11 10:37:09.626510045 +0200

-@@ -168,7 +168,8 @@

-   /* flags state affecting the parser */

-   int expand_aliases;

-   int echo_input_at_read;

--  

-+  int need_here_doc;

-+

- } sh_parser_state_t;

- 

- typedef struct _sh_input_line_state_t {

-@@ -179,6 +180,8 @@

- } sh_input_line_state_t;

- 

- /* Let's try declaring these here. */

-+extern char *parser_remaining_input __P((void));

-+

- extern sh_parser_state_t *save_parser_state __P((sh_parser_state_t *));

- extern void restore_parser_state __P((sh_parser_state_t *));

- 

-+++ b/subst.c	2014-10-11 10:34:38.180611073 +0200

-@@ -1192,12 +1192,18 @@

-    Start extracting at (SINDEX) as if we had just seen "<(".

-    Make (SINDEX) get the position of the matching ")". */ /*))*/

- char *

--extract_process_subst (string, starter, sindex)

-+extract_process_subst (string, starter, sindex, xflags)

-      char *string;

-      char *starter;

-      int *sindex;

-+     int xflags;

- {

-+#if 0

-   return (extract_delimited_string (string, sindex, starter, "(", ")", SX_COMMAND));

-+#else

-+  xflags |= (no_longjmp_on_fatal_error ? SX_NOLONGJMP : 0);

-+  return (xparse_dolparen (string, string+*sindex, sindex, xflags));

-+#endif

- }

- #endif /* PROCESS_SUBSTITUTION */

- 

-@@ -1785,7 +1791,7 @@

- 	  si = i + 2;

- 	  if (string[si] == '\0')

- 	    CQ_RETURN(si);

--	  temp = extract_process_subst (string, (c == '<') ? "<(" : ">(", &si);

-+	  temp = extract_process_subst (string, (c == '<') ? "<(" : ">(", &si, 0);

- 	  free (temp);		/* no SX_ALLOC here */

- 	  i = si;

- 	  if (string[i] == '\0')

-@@ -3248,8 +3254,10 @@

-   if (w->word == 0 || w->word[0] == '\0')

-     return ((char *)NULL);

- 

-+  expand_no_split_dollar_star = 1;

-   w->flags |= W_NOSPLIT2;

-   l = call_expand_word_internal (w, 0, 0, (int *)0, (int *)0);

-+  expand_no_split_dollar_star = 0;

-   if (l)

-     {

-       if (special == 0)			/* LHS */

-@@ -7366,7 +7374,13 @@

-     }

- 

-   if (want_indir)

--    tdesc = parameter_brace_expand_indir (name + 1, var_is_special, quoted, quoted_dollar_atp, contains_dollar_at);

-+    {

-+      tdesc = parameter_brace_expand_indir (name + 1, var_is_special, quoted, quoted_dollar_atp, contains_dollar_at);

-+      /* Turn off the W_ARRAYIND flag because there is no way for this function

-+	 to return the index we're supposed to be using. */

-+      if (tdesc && tdesc->flags)

-+	tdesc->flags &= ~W_ARRAYIND;

-+    }

-   else

-     tdesc = parameter_brace_expand_word (name, var_is_special, quoted, PF_IGNUNBOUND|(pflags&(PF_NOSPLIT2|PF_ASSIGNRHS)), &ind);

- 

-@@ -7847,6 +7861,10 @@

- 	 We also want to make sure that splitting is done no matter what --

- 	 according to POSIX.2, this expands to a list of the positional

- 	 parameters no matter what IFS is set to. */

-+      /* XXX - what to do when in a context where word splitting is not

-+	 performed? Even when IFS is not the default, posix seems to imply

-+	 that we behave like unquoted $* ?  Maybe we should use PF_NOSPLIT2

-+	 here. */

-       temp = string_list_dollar_at (list, (pflags & PF_ASSIGNRHS) ? (quoted|Q_DOUBLE_QUOTES) : quoted);

- 

-       tflag |= W_DOLLARAT;

-@@ -8029,7 +8047,9 @@

- 

- 	  goto return0;

- 	}