7 Bug-Reported-by: Michal Zalewski <lcamtuf@coredump.cx>
13 A combination of nested command substitutions and function importing from
14 the environment can cause bash to execute code appearing in the environment
15 variable value following the function definition.
17 Patch (apply with `patch -p0'):
19 --- a/builtins/evalstring.c
20 +++ b/builtins/evalstring.c
21 @@ -308,12 +308,25 @@ parse_and_execute (string, from_file, fl
23 struct fd_bitmap *bitmap;
25 - if ((flags & SEVAL_FUNCDEF) && command->type != cm_function_def)
26 + if (flags & SEVAL_FUNCDEF)
28 - internal_warning ("%s: ignoring function definition attempt", from_file);
29 - should_jump_to_top_level = 0;
30 - last_result = last_command_exit_value = EX_BADUSAGE;
34 + /* If the command parses to something other than a straight
35 + function definition, or if we have not consumed the entire
36 + string, or if the parser has transformed the function
37 + name (as parsing will if it begins or ends with shell
38 + whitespace, for example), reject the attempt */
39 + if (command->type != cm_function_def ||
40 + ((x = parser_remaining_input ()) && *x) ||
41 + (STREQ (from_file, command->value.Function_def->name->word) == 0))
43 + internal_warning (_("%s: ignoring function definition attempt"), from_file);
44 + should_jump_to_top_level = 0;
45 + last_result = last_command_exit_value = EX_BADUSAGE;
51 bitmap = new_fd_bitmap (FD_BITMAP_SIZE);
52 @@ -378,7 +391,10 @@ parse_and_execute (string, from_file, fl
53 discard_unwind_frame ("pe_dispose");
55 if (flags & SEVAL_ONECMD)
66 @@ -2538,6 +2538,16 @@ shell_ungetc (c)
67 eol_ungetc_lookahead = c;
71 +parser_remaining_input ()
73 + if (shell_input_line == 0)
75 + if (shell_input_line_index < 0 || shell_input_line_index >= shell_input_line_len)
76 + return '\0'; /* XXX */
77 + return (shell_input_line + shell_input_line_index);
81 /* Back the input pointer up by one, effectively `ungetting' a character. */
83 @@ -4027,8 +4037,8 @@ xparse_dolparen (base, string, indp, fla
85 /* reset_parser clears shell_input_line and associated variables */
86 restore_input_line_state (&ls);
92 /* Need to find how many characters parse_and_execute consumed, update
93 *indp, if flags != 0, copy the portion of the string parsed into RET
96 @@ -180,6 +180,8 @@ typedef struct _sh_input_line_state_t {
97 } sh_input_line_state_t;
99 /* Let's try declaring these here. */
100 +extern char *parser_remaining_input __P((void));
102 extern sh_parser_state_t *save_parser_state __P((sh_parser_state_t *));
103 extern void restore_parser_state __P((sh_parser_state_t *));
110 /* Copy the first part of user declarations. */
111 -#line 21 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
112 +#line 21 "/usr/src/local/bash/bash-4.3-patched/parse.y"
116 @@ -497,7 +497,7 @@ static REDIRECTEE redir;
118 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
119 typedef union YYSTYPE
120 -#line 329 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
121 +#line 329 "/usr/src/local/bash/bash-4.3-patched/parse.y"
123 WORD_DESC *word; /* the word that we read. */
124 int number; /* the number that we read. */
125 @@ -2098,7 +2098,7 @@ yyreduce:
129 -#line 383 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
130 +#line 383 "/usr/src/local/bash/bash-4.3-patched/parse.y"
132 /* Case of regular command. Discard the error
133 safety net,and return the command just parsed. */
134 @@ -2112,7 +2112,7 @@ yyreduce:
138 -#line 394 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
139 +#line 394 "/usr/src/local/bash/bash-4.3-patched/parse.y"
141 /* Case of regular command, but not a very
142 interesting one. Return a NULL command. */
143 @@ -2124,7 +2124,7 @@ yyreduce:
147 -#line 403 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
148 +#line 403 "/usr/src/local/bash/bash-4.3-patched/parse.y"
150 /* Error during parsing. Return NULL command. */
151 global_command = (COMMAND *)NULL;
152 @@ -2142,7 +2142,7 @@ yyreduce:
156 -#line 418 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
157 +#line 418 "/usr/src/local/bash/bash-4.3-patched/parse.y"
159 /* Case of EOF seen by itself. Do ignoreeof or
161 @@ -2153,17 +2153,17 @@ yyreduce:
165 -#line 428 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
166 +#line 428 "/usr/src/local/bash/bash-4.3-patched/parse.y"
167 { (yyval.word_list) = make_word_list ((yyvsp[(1) - (1)].word), (WORD_LIST *)NULL); }
171 -#line 430 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
172 +#line 430 "/usr/src/local/bash/bash-4.3-patched/parse.y"
173 { (yyval.word_list) = make_word_list ((yyvsp[(2) - (2)].word), (yyvsp[(1) - (2)].word_list)); }
177 -#line 434 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
178 +#line 434 "/usr/src/local/bash/bash-4.3-patched/parse.y"
181 redir.filename = (yyvsp[(2) - (2)].word);
182 @@ -2172,7 +2172,7 @@ yyreduce:
186 -#line 440 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
187 +#line 440 "/usr/src/local/bash/bash-4.3-patched/parse.y"
190 redir.filename = (yyvsp[(2) - (2)].word);
191 @@ -2181,7 +2181,7 @@ yyreduce:
195 -#line 446 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
196 +#line 446 "/usr/src/local/bash/bash-4.3-patched/parse.y"
198 source.dest = (yyvsp[(1) - (3)].number);
199 redir.filename = (yyvsp[(3) - (3)].word);
200 @@ -2190,7 +2190,7 @@ yyreduce:
204 -#line 452 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
205 +#line 452 "/usr/src/local/bash/bash-4.3-patched/parse.y"
207 source.dest = (yyvsp[(1) - (3)].number);
208 redir.filename = (yyvsp[(3) - (3)].word);
209 @@ -2199,7 +2199,7 @@ yyreduce:
213 -#line 458 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
214 +#line 458 "/usr/src/local/bash/bash-4.3-patched/parse.y"
216 source.filename = (yyvsp[(1) - (3)].word);
217 redir.filename = (yyvsp[(3) - (3)].word);
218 @@ -2208,7 +2208,7 @@ yyreduce:
222 -#line 464 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
223 +#line 464 "/usr/src/local/bash/bash-4.3-patched/parse.y"
225 source.filename = (yyvsp[(1) - (3)].word);
226 redir.filename = (yyvsp[(3) - (3)].word);
227 @@ -2217,7 +2217,7 @@ yyreduce:
231 -#line 470 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
232 +#line 470 "/usr/src/local/bash/bash-4.3-patched/parse.y"
235 redir.filename = (yyvsp[(2) - (2)].word);
236 @@ -2226,7 +2226,7 @@ yyreduce:
240 -#line 476 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
241 +#line 476 "/usr/src/local/bash/bash-4.3-patched/parse.y"
243 source.dest = (yyvsp[(1) - (3)].number);
244 redir.filename = (yyvsp[(3) - (3)].word);
245 @@ -2235,7 +2235,7 @@ yyreduce:
249 -#line 482 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
250 +#line 482 "/usr/src/local/bash/bash-4.3-patched/parse.y"
252 source.filename = (yyvsp[(1) - (3)].word);
253 redir.filename = (yyvsp[(3) - (3)].word);
254 @@ -2244,7 +2244,7 @@ yyreduce:
258 -#line 488 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
259 +#line 488 "/usr/src/local/bash/bash-4.3-patched/parse.y"
262 redir.filename = (yyvsp[(2) - (2)].word);
263 @@ -2253,7 +2253,7 @@ yyreduce:
267 -#line 494 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
268 +#line 494 "/usr/src/local/bash/bash-4.3-patched/parse.y"
270 source.dest = (yyvsp[(1) - (3)].number);
271 redir.filename = (yyvsp[(3) - (3)].word);
272 @@ -2262,7 +2262,7 @@ yyreduce:
276 -#line 500 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
277 +#line 500 "/usr/src/local/bash/bash-4.3-patched/parse.y"
279 source.filename = (yyvsp[(1) - (3)].word);
280 redir.filename = (yyvsp[(3) - (3)].word);
281 @@ -2271,7 +2271,7 @@ yyreduce:
285 -#line 506 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
286 +#line 506 "/usr/src/local/bash/bash-4.3-patched/parse.y"
289 redir.filename = (yyvsp[(2) - (2)].word);
290 @@ -2280,7 +2280,7 @@ yyreduce:
294 -#line 512 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
295 +#line 512 "/usr/src/local/bash/bash-4.3-patched/parse.y"
297 source.dest = (yyvsp[(1) - (3)].number);
298 redir.filename = (yyvsp[(3) - (3)].word);
299 @@ -2289,7 +2289,7 @@ yyreduce:
303 -#line 518 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
304 +#line 518 "/usr/src/local/bash/bash-4.3-patched/parse.y"
306 source.filename = (yyvsp[(1) - (3)].word);
307 redir.filename = (yyvsp[(3) - (3)].word);
308 @@ -2298,7 +2298,7 @@ yyreduce:
312 -#line 524 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
313 +#line 524 "/usr/src/local/bash/bash-4.3-patched/parse.y"
316 redir.filename = (yyvsp[(2) - (2)].word);
317 @@ -2308,7 +2308,7 @@ yyreduce:
321 -#line 531 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
322 +#line 531 "/usr/src/local/bash/bash-4.3-patched/parse.y"
324 source.dest = (yyvsp[(1) - (3)].number);
325 redir.filename = (yyvsp[(3) - (3)].word);
326 @@ -2318,7 +2318,7 @@ yyreduce:
330 -#line 538 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
331 +#line 538 "/usr/src/local/bash/bash-4.3-patched/parse.y"
333 source.filename = (yyvsp[(1) - (3)].word);
334 redir.filename = (yyvsp[(3) - (3)].word);
335 @@ -2328,7 +2328,7 @@ yyreduce:
339 -#line 545 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
340 +#line 545 "/usr/src/local/bash/bash-4.3-patched/parse.y"
343 redir.filename = (yyvsp[(2) - (2)].word);
344 @@ -2338,7 +2338,7 @@ yyreduce:
348 -#line 552 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
349 +#line 552 "/usr/src/local/bash/bash-4.3-patched/parse.y"
351 source.dest = (yyvsp[(1) - (3)].number);
352 redir.filename = (yyvsp[(3) - (3)].word);
353 @@ -2348,7 +2348,7 @@ yyreduce:
357 -#line 559 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
358 +#line 559 "/usr/src/local/bash/bash-4.3-patched/parse.y"
360 source.filename = (yyvsp[(1) - (3)].word);
361 redir.filename = (yyvsp[(3) - (3)].word);
362 @@ -2358,7 +2358,7 @@ yyreduce:
366 -#line 566 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
367 +#line 566 "/usr/src/local/bash/bash-4.3-patched/parse.y"
370 redir.filename = (yyvsp[(2) - (2)].word);
371 @@ -2367,7 +2367,7 @@ yyreduce:
375 -#line 572 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
376 +#line 572 "/usr/src/local/bash/bash-4.3-patched/parse.y"
378 source.dest = (yyvsp[(1) - (3)].number);
379 redir.filename = (yyvsp[(3) - (3)].word);
380 @@ -2376,7 +2376,7 @@ yyreduce:
384 -#line 578 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
385 +#line 578 "/usr/src/local/bash/bash-4.3-patched/parse.y"
387 source.filename = (yyvsp[(1) - (3)].word);
388 redir.filename = (yyvsp[(3) - (3)].word);
389 @@ -2385,7 +2385,7 @@ yyreduce:
393 -#line 584 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
394 +#line 584 "/usr/src/local/bash/bash-4.3-patched/parse.y"
397 redir.dest = (yyvsp[(2) - (2)].number);
398 @@ -2394,7 +2394,7 @@ yyreduce:
402 -#line 590 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
403 +#line 590 "/usr/src/local/bash/bash-4.3-patched/parse.y"
405 source.dest = (yyvsp[(1) - (3)].number);
406 redir.dest = (yyvsp[(3) - (3)].number);
407 @@ -2403,7 +2403,7 @@ yyreduce:
411 -#line 596 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
412 +#line 596 "/usr/src/local/bash/bash-4.3-patched/parse.y"
414 source.filename = (yyvsp[(1) - (3)].word);
415 redir.dest = (yyvsp[(3) - (3)].number);
416 @@ -2412,7 +2412,7 @@ yyreduce:
420 -#line 602 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
421 +#line 602 "/usr/src/local/bash/bash-4.3-patched/parse.y"
424 redir.dest = (yyvsp[(2) - (2)].number);
425 @@ -2421,7 +2421,7 @@ yyreduce:
429 -#line 608 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
430 +#line 608 "/usr/src/local/bash/bash-4.3-patched/parse.y"
432 source.dest = (yyvsp[(1) - (3)].number);
433 redir.dest = (yyvsp[(3) - (3)].number);
434 @@ -2430,7 +2430,7 @@ yyreduce:
438 -#line 614 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
439 +#line 614 "/usr/src/local/bash/bash-4.3-patched/parse.y"
441 source.filename = (yyvsp[(1) - (3)].word);
442 redir.dest = (yyvsp[(3) - (3)].number);
443 @@ -2439,7 +2439,7 @@ yyreduce:
447 -#line 620 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
448 +#line 620 "/usr/src/local/bash/bash-4.3-patched/parse.y"
451 redir.filename = (yyvsp[(2) - (2)].word);
452 @@ -2448,7 +2448,7 @@ yyreduce:
456 -#line 626 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
457 +#line 626 "/usr/src/local/bash/bash-4.3-patched/parse.y"
459 source.dest = (yyvsp[(1) - (3)].number);
460 redir.filename = (yyvsp[(3) - (3)].word);
461 @@ -2457,7 +2457,7 @@ yyreduce:
465 -#line 632 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
466 +#line 632 "/usr/src/local/bash/bash-4.3-patched/parse.y"
468 source.filename = (yyvsp[(1) - (3)].word);
469 redir.filename = (yyvsp[(3) - (3)].word);
470 @@ -2466,7 +2466,7 @@ yyreduce:
474 -#line 638 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
475 +#line 638 "/usr/src/local/bash/bash-4.3-patched/parse.y"
478 redir.filename = (yyvsp[(2) - (2)].word);
479 @@ -2475,7 +2475,7 @@ yyreduce:
483 -#line 644 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
484 +#line 644 "/usr/src/local/bash/bash-4.3-patched/parse.y"
486 source.dest = (yyvsp[(1) - (3)].number);
487 redir.filename = (yyvsp[(3) - (3)].word);
488 @@ -2484,7 +2484,7 @@ yyreduce:
492 -#line 650 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
493 +#line 650 "/usr/src/local/bash/bash-4.3-patched/parse.y"
495 source.filename = (yyvsp[(1) - (3)].word);
496 redir.filename = (yyvsp[(3) - (3)].word);
497 @@ -2493,7 +2493,7 @@ yyreduce:
501 -#line 656 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
502 +#line 656 "/usr/src/local/bash/bash-4.3-patched/parse.y"
506 @@ -2502,7 +2502,7 @@ yyreduce:
510 -#line 662 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
511 +#line 662 "/usr/src/local/bash/bash-4.3-patched/parse.y"
513 source.dest = (yyvsp[(1) - (3)].number);
515 @@ -2511,7 +2511,7 @@ yyreduce:
519 -#line 668 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
520 +#line 668 "/usr/src/local/bash/bash-4.3-patched/parse.y"
522 source.filename = (yyvsp[(1) - (3)].word);
524 @@ -2520,7 +2520,7 @@ yyreduce:
528 -#line 674 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
529 +#line 674 "/usr/src/local/bash/bash-4.3-patched/parse.y"
533 @@ -2529,7 +2529,7 @@ yyreduce:
537 -#line 680 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
538 +#line 680 "/usr/src/local/bash/bash-4.3-patched/parse.y"
540 source.dest = (yyvsp[(1) - (3)].number);
542 @@ -2538,7 +2538,7 @@ yyreduce:
546 -#line 686 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
547 +#line 686 "/usr/src/local/bash/bash-4.3-patched/parse.y"
549 source.filename = (yyvsp[(1) - (3)].word);
551 @@ -2547,7 +2547,7 @@ yyreduce:
555 -#line 692 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
556 +#line 692 "/usr/src/local/bash/bash-4.3-patched/parse.y"
559 redir.filename = (yyvsp[(2) - (2)].word);
560 @@ -2556,7 +2556,7 @@ yyreduce:
564 -#line 698 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
565 +#line 698 "/usr/src/local/bash/bash-4.3-patched/parse.y"
568 redir.filename = (yyvsp[(2) - (2)].word);
569 @@ -2565,29 +2565,29 @@ yyreduce:
573 -#line 706 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
574 +#line 706 "/usr/src/local/bash/bash-4.3-patched/parse.y"
575 { (yyval.element).word = (yyvsp[(1) - (1)].word); (yyval.element).redirect = 0; }
579 -#line 708 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
580 +#line 708 "/usr/src/local/bash/bash-4.3-patched/parse.y"
581 { (yyval.element).word = (yyvsp[(1) - (1)].word); (yyval.element).redirect = 0; }
585 -#line 710 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
586 +#line 710 "/usr/src/local/bash/bash-4.3-patched/parse.y"
587 { (yyval.element).redirect = (yyvsp[(1) - (1)].redirect); (yyval.element).word = 0; }
591 -#line 714 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
592 +#line 714 "/usr/src/local/bash/bash-4.3-patched/parse.y"
594 (yyval.redirect) = (yyvsp[(1) - (1)].redirect);
599 -#line 718 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
600 +#line 718 "/usr/src/local/bash/bash-4.3-patched/parse.y"
602 register REDIRECT *t;
604 @@ -2599,27 +2599,27 @@ yyreduce:
608 -#line 729 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
609 +#line 729 "/usr/src/local/bash/bash-4.3-patched/parse.y"
610 { (yyval.command) = make_simple_command ((yyvsp[(1) - (1)].element), (COMMAND *)NULL); }
614 -#line 731 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
615 +#line 731 "/usr/src/local/bash/bash-4.3-patched/parse.y"
616 { (yyval.command) = make_simple_command ((yyvsp[(2) - (2)].element), (yyvsp[(1) - (2)].command)); }
620 -#line 735 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
621 +#line 735 "/usr/src/local/bash/bash-4.3-patched/parse.y"
622 { (yyval.command) = clean_simple_command ((yyvsp[(1) - (1)].command)); }
626 -#line 737 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
627 +#line 737 "/usr/src/local/bash/bash-4.3-patched/parse.y"
628 { (yyval.command) = (yyvsp[(1) - (1)].command); }
632 -#line 739 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
633 +#line 739 "/usr/src/local/bash/bash-4.3-patched/parse.y"
637 @@ -2638,72 +2638,72 @@ yyreduce:
641 -#line 755 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
642 +#line 755 "/usr/src/local/bash/bash-4.3-patched/parse.y"
643 { (yyval.command) = (yyvsp[(1) - (1)].command); }
647 -#line 757 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
648 +#line 757 "/usr/src/local/bash/bash-4.3-patched/parse.y"
649 { (yyval.command) = (yyvsp[(1) - (1)].command); }
653 -#line 761 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
654 +#line 761 "/usr/src/local/bash/bash-4.3-patched/parse.y"
655 { (yyval.command) = (yyvsp[(1) - (1)].command); }
659 -#line 763 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
660 +#line 763 "/usr/src/local/bash/bash-4.3-patched/parse.y"
661 { (yyval.command) = (yyvsp[(1) - (1)].command); }
665 -#line 765 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
666 +#line 765 "/usr/src/local/bash/bash-4.3-patched/parse.y"
667 { (yyval.command) = make_while_command ((yyvsp[(2) - (5)].command), (yyvsp[(4) - (5)].command)); }
671 -#line 767 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
672 +#line 767 "/usr/src/local/bash/bash-4.3-patched/parse.y"
673 { (yyval.command) = make_until_command ((yyvsp[(2) - (5)].command), (yyvsp[(4) - (5)].command)); }
677 -#line 769 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
678 +#line 769 "/usr/src/local/bash/bash-4.3-patched/parse.y"
679 { (yyval.command) = (yyvsp[(1) - (1)].command); }
683 -#line 771 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
684 +#line 771 "/usr/src/local/bash/bash-4.3-patched/parse.y"
685 { (yyval.command) = (yyvsp[(1) - (1)].command); }
689 -#line 773 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
690 +#line 773 "/usr/src/local/bash/bash-4.3-patched/parse.y"
691 { (yyval.command) = (yyvsp[(1) - (1)].command); }
695 -#line 775 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
696 +#line 775 "/usr/src/local/bash/bash-4.3-patched/parse.y"
697 { (yyval.command) = (yyvsp[(1) - (1)].command); }
701 -#line 777 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
702 +#line 777 "/usr/src/local/bash/bash-4.3-patched/parse.y"
703 { (yyval.command) = (yyvsp[(1) - (1)].command); }
707 -#line 779 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
708 +#line 779 "/usr/src/local/bash/bash-4.3-patched/parse.y"
709 { (yyval.command) = (yyvsp[(1) - (1)].command); }
713 -#line 781 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
714 +#line 781 "/usr/src/local/bash/bash-4.3-patched/parse.y"
715 { (yyval.command) = (yyvsp[(1) - (1)].command); }
719 -#line 785 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
720 +#line 785 "/usr/src/local/bash/bash-4.3-patched/parse.y"
722 (yyval.command) = make_for_command ((yyvsp[(2) - (6)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(5) - (6)].command), word_lineno[word_top]);
723 if (word_top > 0) word_top--;
724 @@ -2711,7 +2711,7 @@ yyreduce:
728 -#line 790 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
729 +#line 790 "/usr/src/local/bash/bash-4.3-patched/parse.y"
731 (yyval.command) = make_for_command ((yyvsp[(2) - (6)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(5) - (6)].command), word_lineno[word_top]);
732 if (word_top > 0) word_top--;
733 @@ -2719,7 +2719,7 @@ yyreduce:
737 -#line 795 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
738 +#line 795 "/usr/src/local/bash/bash-4.3-patched/parse.y"
740 (yyval.command) = make_for_command ((yyvsp[(2) - (7)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(6) - (7)].command), word_lineno[word_top]);
741 if (word_top > 0) word_top--;
742 @@ -2727,7 +2727,7 @@ yyreduce:
746 -#line 800 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
747 +#line 800 "/usr/src/local/bash/bash-4.3-patched/parse.y"
749 (yyval.command) = make_for_command ((yyvsp[(2) - (7)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(6) - (7)].command), word_lineno[word_top]);
750 if (word_top > 0) word_top--;
751 @@ -2735,7 +2735,7 @@ yyreduce:
755 -#line 805 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
756 +#line 805 "/usr/src/local/bash/bash-4.3-patched/parse.y"
758 (yyval.command) = make_for_command ((yyvsp[(2) - (10)].word), REVERSE_LIST ((yyvsp[(5) - (10)].word_list), WORD_LIST *), (yyvsp[(9) - (10)].command), word_lineno[word_top]);
759 if (word_top > 0) word_top--;
760 @@ -2743,7 +2743,7 @@ yyreduce:
764 -#line 810 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
765 +#line 810 "/usr/src/local/bash/bash-4.3-patched/parse.y"
767 (yyval.command) = make_for_command ((yyvsp[(2) - (10)].word), REVERSE_LIST ((yyvsp[(5) - (10)].word_list), WORD_LIST *), (yyvsp[(9) - (10)].command), word_lineno[word_top]);
768 if (word_top > 0) word_top--;
769 @@ -2751,7 +2751,7 @@ yyreduce:
773 -#line 815 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
774 +#line 815 "/usr/src/local/bash/bash-4.3-patched/parse.y"
776 (yyval.command) = make_for_command ((yyvsp[(2) - (9)].word), (WORD_LIST *)NULL, (yyvsp[(8) - (9)].command), word_lineno[word_top]);
777 if (word_top > 0) word_top--;
778 @@ -2759,7 +2759,7 @@ yyreduce:
782 -#line 820 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
783 +#line 820 "/usr/src/local/bash/bash-4.3-patched/parse.y"
785 (yyval.command) = make_for_command ((yyvsp[(2) - (9)].word), (WORD_LIST *)NULL, (yyvsp[(8) - (9)].command), word_lineno[word_top]);
786 if (word_top > 0) word_top--;
787 @@ -2767,7 +2767,7 @@ yyreduce:
791 -#line 827 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
792 +#line 827 "/usr/src/local/bash/bash-4.3-patched/parse.y"
794 (yyval.command) = make_arith_for_command ((yyvsp[(2) - (7)].word_list), (yyvsp[(6) - (7)].command), arith_for_lineno);
795 if (word_top > 0) word_top--;
796 @@ -2775,7 +2775,7 @@ yyreduce:
800 -#line 832 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
801 +#line 832 "/usr/src/local/bash/bash-4.3-patched/parse.y"
803 (yyval.command) = make_arith_for_command ((yyvsp[(2) - (7)].word_list), (yyvsp[(6) - (7)].command), arith_for_lineno);
804 if (word_top > 0) word_top--;
805 @@ -2783,7 +2783,7 @@ yyreduce:
809 -#line 837 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
810 +#line 837 "/usr/src/local/bash/bash-4.3-patched/parse.y"
812 (yyval.command) = make_arith_for_command ((yyvsp[(2) - (5)].word_list), (yyvsp[(4) - (5)].command), arith_for_lineno);
813 if (word_top > 0) word_top--;
814 @@ -2791,7 +2791,7 @@ yyreduce:
818 -#line 842 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
819 +#line 842 "/usr/src/local/bash/bash-4.3-patched/parse.y"
821 (yyval.command) = make_arith_for_command ((yyvsp[(2) - (5)].word_list), (yyvsp[(4) - (5)].command), arith_for_lineno);
822 if (word_top > 0) word_top--;
823 @@ -2799,7 +2799,7 @@ yyreduce:
827 -#line 849 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
828 +#line 849 "/usr/src/local/bash/bash-4.3-patched/parse.y"
830 (yyval.command) = make_select_command ((yyvsp[(2) - (6)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(5) - (6)].command), word_lineno[word_top]);
831 if (word_top > 0) word_top--;
832 @@ -2807,7 +2807,7 @@ yyreduce:
836 -#line 854 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
837 +#line 854 "/usr/src/local/bash/bash-4.3-patched/parse.y"
839 (yyval.command) = make_select_command ((yyvsp[(2) - (6)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(5) - (6)].command), word_lineno[word_top]);
840 if (word_top > 0) word_top--;
841 @@ -2815,7 +2815,7 @@ yyreduce:
845 -#line 859 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
846 +#line 859 "/usr/src/local/bash/bash-4.3-patched/parse.y"
848 (yyval.command) = make_select_command ((yyvsp[(2) - (7)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(6) - (7)].command), word_lineno[word_top]);
849 if (word_top > 0) word_top--;
850 @@ -2823,7 +2823,7 @@ yyreduce:
854 -#line 864 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
855 +#line 864 "/usr/src/local/bash/bash-4.3-patched/parse.y"
857 (yyval.command) = make_select_command ((yyvsp[(2) - (7)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(6) - (7)].command), word_lineno[word_top]);
858 if (word_top > 0) word_top--;
859 @@ -2831,7 +2831,7 @@ yyreduce:
863 -#line 869 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
864 +#line 869 "/usr/src/local/bash/bash-4.3-patched/parse.y"
866 (yyval.command) = make_select_command ((yyvsp[(2) - (10)].word), REVERSE_LIST ((yyvsp[(5) - (10)].word_list), WORD_LIST *), (yyvsp[(9) - (10)].command), word_lineno[word_top]);
867 if (word_top > 0) word_top--;
868 @@ -2839,7 +2839,7 @@ yyreduce:
872 -#line 874 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
873 +#line 874 "/usr/src/local/bash/bash-4.3-patched/parse.y"
875 (yyval.command) = make_select_command ((yyvsp[(2) - (10)].word), REVERSE_LIST ((yyvsp[(5) - (10)].word_list), WORD_LIST *), (yyvsp[(9) - (10)].command), word_lineno[word_top]);
876 if (word_top > 0) word_top--;
877 @@ -2847,7 +2847,7 @@ yyreduce:
881 -#line 881 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
882 +#line 881 "/usr/src/local/bash/bash-4.3-patched/parse.y"
884 (yyval.command) = make_case_command ((yyvsp[(2) - (6)].word), (PATTERN_LIST *)NULL, word_lineno[word_top]);
885 if (word_top > 0) word_top--;
886 @@ -2855,7 +2855,7 @@ yyreduce:
890 -#line 886 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
891 +#line 886 "/usr/src/local/bash/bash-4.3-patched/parse.y"
893 (yyval.command) = make_case_command ((yyvsp[(2) - (7)].word), (yyvsp[(5) - (7)].pattern), word_lineno[word_top]);
894 if (word_top > 0) word_top--;
895 @@ -2863,7 +2863,7 @@ yyreduce:
899 -#line 891 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
900 +#line 891 "/usr/src/local/bash/bash-4.3-patched/parse.y"
902 (yyval.command) = make_case_command ((yyvsp[(2) - (6)].word), (yyvsp[(5) - (6)].pattern), word_lineno[word_top]);
903 if (word_top > 0) word_top--;
904 @@ -2871,27 +2871,27 @@ yyreduce:
908 -#line 898 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
909 +#line 898 "/usr/src/local/bash/bash-4.3-patched/parse.y"
910 { (yyval.command) = make_function_def ((yyvsp[(1) - (5)].word), (yyvsp[(5) - (5)].command), function_dstart, function_bstart); }
914 -#line 901 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
915 +#line 901 "/usr/src/local/bash/bash-4.3-patched/parse.y"
916 { (yyval.command) = make_function_def ((yyvsp[(2) - (6)].word), (yyvsp[(6) - (6)].command), function_dstart, function_bstart); }
920 -#line 904 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
921 +#line 904 "/usr/src/local/bash/bash-4.3-patched/parse.y"
922 { (yyval.command) = make_function_def ((yyvsp[(2) - (4)].word), (yyvsp[(4) - (4)].command), function_dstart, function_bstart); }
926 -#line 908 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
927 +#line 908 "/usr/src/local/bash/bash-4.3-patched/parse.y"
928 { (yyval.command) = (yyvsp[(1) - (1)].command); }
932 -#line 910 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
933 +#line 910 "/usr/src/local/bash/bash-4.3-patched/parse.y"
937 @@ -2923,7 +2923,7 @@ yyreduce:
941 -#line 941 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
942 +#line 941 "/usr/src/local/bash/bash-4.3-patched/parse.y"
944 (yyval.command) = make_subshell_command ((yyvsp[(2) - (3)].command));
945 (yyval.command)->flags |= CMD_WANT_SUBSHELL;
946 @@ -2931,7 +2931,7 @@ yyreduce:
950 -#line 948 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
951 +#line 948 "/usr/src/local/bash/bash-4.3-patched/parse.y"
953 (yyval.command) = make_coproc_command ("COPROC", (yyvsp[(2) - (2)].command));
954 (yyval.command)->flags |= CMD_WANT_SUBSHELL|CMD_COPROC_SUBSHELL;
955 @@ -2939,7 +2939,7 @@ yyreduce:
959 -#line 953 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
960 +#line 953 "/usr/src/local/bash/bash-4.3-patched/parse.y"
964 @@ -2959,7 +2959,7 @@ yyreduce:
968 -#line 970 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
969 +#line 970 "/usr/src/local/bash/bash-4.3-patched/parse.y"
971 (yyval.command) = make_coproc_command ((yyvsp[(2) - (3)].word)->word, (yyvsp[(3) - (3)].command));
972 (yyval.command)->flags |= CMD_WANT_SUBSHELL|CMD_COPROC_SUBSHELL;
973 @@ -2967,7 +2967,7 @@ yyreduce:
977 -#line 975 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
978 +#line 975 "/usr/src/local/bash/bash-4.3-patched/parse.y"
982 @@ -2987,7 +2987,7 @@ yyreduce:
986 -#line 992 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
987 +#line 992 "/usr/src/local/bash/bash-4.3-patched/parse.y"
989 (yyval.command) = make_coproc_command ("COPROC", clean_simple_command ((yyvsp[(2) - (2)].command)));
990 (yyval.command)->flags |= CMD_WANT_SUBSHELL|CMD_COPROC_SUBSHELL;
991 @@ -2995,117 +2995,117 @@ yyreduce:
995 -#line 999 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
996 +#line 999 "/usr/src/local/bash/bash-4.3-patched/parse.y"
997 { (yyval.command) = make_if_command ((yyvsp[(2) - (5)].command), (yyvsp[(4) - (5)].command), (COMMAND *)NULL); }
1001 -#line 1001 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
1002 +#line 1001 "/usr/src/local/bash/bash-4.3-patched/parse.y"
1003 { (yyval.command) = make_if_command ((yyvsp[(2) - (7)].command), (yyvsp[(4) - (7)].command), (yyvsp[(6) - (7)].command)); }
1007 -#line 1003 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
1008 +#line 1003 "/usr/src/local/bash/bash-4.3-patched/parse.y"
1009 { (yyval.command) = make_if_command ((yyvsp[(2) - (6)].command), (yyvsp[(4) - (6)].command), (yyvsp[(5) - (6)].command)); }
1013 -#line 1008 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
1014 +#line 1008 "/usr/src/local/bash/bash-4.3-patched/parse.y"
1015 { (yyval.command) = make_group_command ((yyvsp[(2) - (3)].command)); }
1019 -#line 1012 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
1020 +#line 1012 "/usr/src/local/bash/bash-4.3-patched/parse.y"
1021 { (yyval.command) = make_arith_command ((yyvsp[(1) - (1)].word_list)); }
1025 -#line 1016 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
1026 +#line 1016 "/usr/src/local/bash/bash-4.3-patched/parse.y"
1027 { (yyval.command) = (yyvsp[(2) - (3)].command); }
1031 -#line 1020 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
1032 +#line 1020 "/usr/src/local/bash/bash-4.3-patched/parse.y"
1033 { (yyval.command) = make_if_command ((yyvsp[(2) - (4)].command), (yyvsp[(4) - (4)].command), (COMMAND *)NULL); }
1037 -#line 1022 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
1038 +#line 1022 "/usr/src/local/bash/bash-4.3-patched/parse.y"
1039 { (yyval.command) = make_if_command ((yyvsp[(2) - (6)].command), (yyvsp[(4) - (6)].command), (yyvsp[(6) - (6)].command)); }
1043 -#line 1024 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
1044 +#line 1024 "/usr/src/local/bash/bash-4.3-patched/parse.y"
1045 { (yyval.command) = make_if_command ((yyvsp[(2) - (5)].command), (yyvsp[(4) - (5)].command), (yyvsp[(5) - (5)].command)); }
1049 -#line 1029 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
1050 +#line 1029 "/usr/src/local/bash/bash-4.3-patched/parse.y"
1051 { (yyvsp[(2) - (2)].pattern)->next = (yyvsp[(1) - (2)].pattern); (yyval.pattern) = (yyvsp[(2) - (2)].pattern); }
1055 -#line 1033 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
1056 +#line 1033 "/usr/src/local/bash/bash-4.3-patched/parse.y"
1057 { (yyval.pattern) = make_pattern_list ((yyvsp[(2) - (4)].word_list), (yyvsp[(4) - (4)].command)); }
1061 -#line 1035 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
1062 +#line 1035 "/usr/src/local/bash/bash-4.3-patched/parse.y"
1063 { (yyval.pattern) = make_pattern_list ((yyvsp[(2) - (4)].word_list), (COMMAND *)NULL); }
1067 -#line 1037 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
1068 +#line 1037 "/usr/src/local/bash/bash-4.3-patched/parse.y"
1069 { (yyval.pattern) = make_pattern_list ((yyvsp[(3) - (5)].word_list), (yyvsp[(5) - (5)].command)); }
1073 -#line 1039 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
1074 +#line 1039 "/usr/src/local/bash/bash-4.3-patched/parse.y"
1075 { (yyval.pattern) = make_pattern_list ((yyvsp[(3) - (5)].word_list), (COMMAND *)NULL); }
1079 -#line 1043 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
1080 +#line 1043 "/usr/src/local/bash/bash-4.3-patched/parse.y"
1081 { (yyval.pattern) = (yyvsp[(1) - (2)].pattern); }
1085 -#line 1045 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
1086 +#line 1045 "/usr/src/local/bash/bash-4.3-patched/parse.y"
1087 { (yyvsp[(2) - (3)].pattern)->next = (yyvsp[(1) - (3)].pattern); (yyval.pattern) = (yyvsp[(2) - (3)].pattern); }
1091 -#line 1047 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
1092 +#line 1047 "/usr/src/local/bash/bash-4.3-patched/parse.y"
1093 { (yyvsp[(1) - (2)].pattern)->flags |= CASEPAT_FALLTHROUGH; (yyval.pattern) = (yyvsp[(1) - (2)].pattern); }
1097 -#line 1049 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
1098 +#line 1049 "/usr/src/local/bash/bash-4.3-patched/parse.y"
1099 { (yyvsp[(2) - (3)].pattern)->flags |= CASEPAT_FALLTHROUGH; (yyvsp[(2) - (3)].pattern)->next = (yyvsp[(1) - (3)].pattern); (yyval.pattern) = (yyvsp[(2) - (3)].pattern); }
1103 -#line 1051 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
1104 +#line 1051 "/usr/src/local/bash/bash-4.3-patched/parse.y"
1105 { (yyvsp[(1) - (2)].pattern)->flags |= CASEPAT_TESTNEXT; (yyval.pattern) = (yyvsp[(1) - (2)].pattern); }
1109 -#line 1053 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
1110 +#line 1053 "/usr/src/local/bash/bash-4.3-patched/parse.y"
1111 { (yyvsp[(2) - (3)].pattern)->flags |= CASEPAT_TESTNEXT; (yyvsp[(2) - (3)].pattern)->next = (yyvsp[(1) - (3)].pattern); (yyval.pattern) = (yyvsp[(2) - (3)].pattern); }
1115 -#line 1057 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
1116 +#line 1057 "/usr/src/local/bash/bash-4.3-patched/parse.y"
1117 { (yyval.word_list) = make_word_list ((yyvsp[(1) - (1)].word), (WORD_LIST *)NULL); }
1121 -#line 1059 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
1122 +#line 1059 "/usr/src/local/bash/bash-4.3-patched/parse.y"
1123 { (yyval.word_list) = make_word_list ((yyvsp[(3) - (3)].word), (yyvsp[(1) - (3)].word_list)); }
1127 -#line 1068 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
1128 +#line 1068 "/usr/src/local/bash/bash-4.3-patched/parse.y"
1130 (yyval.command) = (yyvsp[(2) - (2)].command);
1132 @@ -3114,14 +3114,14 @@ yyreduce:
1136 -#line 1077 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
1137 +#line 1077 "/usr/src/local/bash/bash-4.3-patched/parse.y"
1139 (yyval.command) = (yyvsp[(2) - (2)].command);
1144 -#line 1084 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
1145 +#line 1084 "/usr/src/local/bash/bash-4.3-patched/parse.y"
1147 if ((yyvsp[(1) - (3)].command)->type == cm_connection)
1148 (yyval.command) = connect_async_list ((yyvsp[(1) - (3)].command), (COMMAND *)NULL, '&');
1149 @@ -3131,17 +3131,17 @@ yyreduce:
1153 -#line 1095 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
1154 +#line 1095 "/usr/src/local/bash/bash-4.3-patched/parse.y"
1155 { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), AND_AND); }
1159 -#line 1097 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
1160 +#line 1097 "/usr/src/local/bash/bash-4.3-patched/parse.y"
1161 { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), OR_OR); }
1165 -#line 1099 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
1166 +#line 1099 "/usr/src/local/bash/bash-4.3-patched/parse.y"
1168 if ((yyvsp[(1) - (4)].command)->type == cm_connection)
1169 (yyval.command) = connect_async_list ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), '&');
1170 @@ -3151,37 +3151,37 @@ yyreduce:
1174 -#line 1106 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
1175 +#line 1106 "/usr/src/local/bash/bash-4.3-patched/parse.y"
1176 { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), ';'); }
1180 -#line 1108 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
1181 +#line 1108 "/usr/src/local/bash/bash-4.3-patched/parse.y"
1182 { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), ';'); }
1186 -#line 1110 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
1187 +#line 1110 "/usr/src/local/bash/bash-4.3-patched/parse.y"
1188 { (yyval.command) = (yyvsp[(1) - (1)].command); }
1192 -#line 1118 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
1193 +#line 1118 "/usr/src/local/bash/bash-4.3-patched/parse.y"
1194 { (yyval.number) = '\n'; }
1198 -#line 1120 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
1199 +#line 1120 "/usr/src/local/bash/bash-4.3-patched/parse.y"
1200 { (yyval.number) = ';'; }
1204 -#line 1122 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
1205 +#line 1122 "/usr/src/local/bash/bash-4.3-patched/parse.y"
1206 { (yyval.number) = yacc_EOF; }
1210 -#line 1136 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
1211 +#line 1136 "/usr/src/local/bash/bash-4.3-patched/parse.y"
1213 (yyval.command) = (yyvsp[(1) - (1)].command);
1215 @@ -3197,7 +3197,7 @@ yyreduce:
1219 -#line 1149 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
1220 +#line 1149 "/usr/src/local/bash/bash-4.3-patched/parse.y"
1222 if ((yyvsp[(1) - (2)].command)->type == cm_connection)
1223 (yyval.command) = connect_async_list ((yyvsp[(1) - (2)].command), (COMMAND *)NULL, '&');
1224 @@ -3216,7 +3216,7 @@ yyreduce:
1228 -#line 1165 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
1229 +#line 1165 "/usr/src/local/bash/bash-4.3-patched/parse.y"
1231 (yyval.command) = (yyvsp[(1) - (2)].command);
1233 @@ -3232,17 +3232,17 @@ yyreduce:
1237 -#line 1180 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
1238 +#line 1180 "/usr/src/local/bash/bash-4.3-patched/parse.y"
1239 { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), AND_AND); }
1243 -#line 1182 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
1244 +#line 1182 "/usr/src/local/bash/bash-4.3-patched/parse.y"
1245 { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), OR_OR); }
1249 -#line 1184 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
1250 +#line 1184 "/usr/src/local/bash/bash-4.3-patched/parse.y"
1252 if ((yyvsp[(1) - (3)].command)->type == cm_connection)
1253 (yyval.command) = connect_async_list ((yyvsp[(1) - (3)].command), (yyvsp[(3) - (3)].command), '&');
1254 @@ -3252,22 +3252,22 @@ yyreduce:
1258 -#line 1191 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
1259 +#line 1191 "/usr/src/local/bash/bash-4.3-patched/parse.y"
1260 { (yyval.command) = command_connect ((yyvsp[(1) - (3)].command), (yyvsp[(3) - (3)].command), ';'); }
1264 -#line 1194 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
1265 +#line 1194 "/usr/src/local/bash/bash-4.3-patched/parse.y"
1266 { (yyval.command) = (yyvsp[(1) - (1)].command); }
1270 -#line 1198 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
1271 +#line 1198 "/usr/src/local/bash/bash-4.3-patched/parse.y"
1272 { (yyval.command) = (yyvsp[(1) - (1)].command); }
1276 -#line 1200 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
1277 +#line 1200 "/usr/src/local/bash/bash-4.3-patched/parse.y"
1279 if ((yyvsp[(2) - (2)].command))
1280 (yyvsp[(2) - (2)].command)->flags ^= CMD_INVERT_RETURN; /* toggle */
1281 @@ -3276,7 +3276,7 @@ yyreduce:
1285 -#line 1206 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
1286 +#line 1206 "/usr/src/local/bash/bash-4.3-patched/parse.y"
1288 if ((yyvsp[(2) - (2)].command))
1289 (yyvsp[(2) - (2)].command)->flags |= (yyvsp[(1) - (2)].number);
1290 @@ -3285,7 +3285,7 @@ yyreduce:
1294 -#line 1212 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
1295 +#line 1212 "/usr/src/local/bash/bash-4.3-patched/parse.y"
1299 @@ -3305,7 +3305,7 @@ yyreduce:
1303 -#line 1229 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
1304 +#line 1229 "/usr/src/local/bash/bash-4.3-patched/parse.y"
1308 @@ -3326,12 +3326,12 @@ yyreduce:
1312 -#line 1249 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
1313 +#line 1249 "/usr/src/local/bash/bash-4.3-patched/parse.y"
1314 { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), '|'); }
1318 -#line 1251 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
1319 +#line 1251 "/usr/src/local/bash/bash-4.3-patched/parse.y"
1321 /* Make cmd1 |& cmd2 equivalent to cmd1 2>&1 | cmd2 */
1323 @@ -3357,22 +3357,22 @@ yyreduce:
1327 -#line 1274 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
1328 +#line 1274 "/usr/src/local/bash/bash-4.3-patched/parse.y"
1329 { (yyval.command) = (yyvsp[(1) - (1)].command); }
1333 -#line 1278 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
1334 +#line 1278 "/usr/src/local/bash/bash-4.3-patched/parse.y"
1335 { (yyval.number) = CMD_TIME_PIPELINE; }
1339 -#line 1280 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
1340 +#line 1280 "/usr/src/local/bash/bash-4.3-patched/parse.y"
1341 { (yyval.number) = CMD_TIME_PIPELINE|CMD_TIME_POSIX; }
1345 -#line 1282 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
1346 +#line 1282 "/usr/src/local/bash/bash-4.3-patched/parse.y"
1347 { (yyval.number) = CMD_TIME_PIPELINE|CMD_TIME_POSIX; }
1350 @@ -3592,7 +3592,7 @@ yyreturn:
1354 -#line 1284 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
1355 +#line 1284 "/usr/src/local/bash/bash-4.3-patched/parse.y"
1358 /* Initial size to allocate for tokens, and the
1359 @@ -4850,6 +4850,16 @@ shell_ungetc (c)
1360 eol_ungetc_lookahead = c;
1364 +parser_remaining_input ()
1366 + if (shell_input_line == 0)
1368 + if (shell_input_line_index < 0 || shell_input_line_index >= shell_input_line_len)
1369 + return '\0'; /* XXX */
1370 + return (shell_input_line + shell_input_line_index);
1373 #ifdef INCLUDE_UNUSED
1374 /* Back the input pointer up by one, effectively `ungetting' a character. */
1376 @@ -6339,8 +6349,8 @@ xparse_dolparen (base, string, indp, fla
1378 /* reset_parser clears shell_input_line and associated variables */
1379 restore_input_line_state (&ls);
1381 - token_to_read = 0;
1383 + token_to_read = 0;
1385 /* Need to find how many characters parse_and_execute consumed, update
1386 *indp, if flags != 0, copy the portion of the string parsed into RET
1390 regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
1391 looks for to find the patch level (for the sccs version string). */
1393 -#define PATCHLEVEL 29
1394 +#define PATCHLEVEL 30
1396 #endif /* _PATCHLEVEL_H_ */