bash-004-patchlevel30.patch 62 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091929394959697989910010110210310410510610710810911011111211311411511611711811912012112212312412512612712812913013113213313413513613713813914014114214314414514614714814915015115215315415515615715815916016116216316416516616716816917017117217317417517617717817918018118218318418518618718818919019119219319419519619719819920020120220320420520620720820921021121221321421521621721821922022122222322422522622722822923023123223323423523623723823924024124224324424524624724824925025125225325425525625725825926026126226326426526626726826927027127227327427527627727827928028128228328428528628728828929029129229329429529629729829930030130230330430530630730830931031131231331431531631731831932032132232332432532632732832933033133233333433533633733833934034134234334434534634734834935035135235335435535635735835936036136236336436536636736836937037137237337437537637737837938038138238338438538638738838939039139239339439539639739839940040140240340440540640740840941041141241341441541641741841942042142242342442542642742842943043143243343443543643743843944044144244344444544644744844945045145245345445545645745845946046146246346446546646746846947047147247347447547647747847948048148248348448548648748848949049149249349449549649749849950050150250350450550650750850951051151251351451551651751851952052152252352452552652752852953053153253353453553653753853954054154254354454554654754854955055155255355455555655755855956056156256356456556656756856957057157257357457557657757857958058158258358458558658758858959059159259359459559659759859960060160260360460560660760860961061161261361461561661761861962062162262362462562662762862963063163263363463563663763863964064164264364464564664764864965065165265365465565665765865966066166266366466566666766866967067167267367467567667767867968068168268368468568668768868969069169269369469569669769869970070170270370470570670770870971071171271371471571671771871972072172272372472572672772872973073173273373473573673773873974074174274374474574674774874975075175275375475575675775875976076176276376476576676776876977077177277377477577677777877978078178278378478578678778878979079179279379479579679779879980080180280380480580680780880981081181281381481581681781881982082182282382482582682782882983083183283383483583683783883984084184284384484584684784884985085185285385485585685785885986086186286386486586686786886987087187287387487587687787887988088188288388488588688788888989089189289389489589689789889990090190290390490590690790890991091191291391491591691791891992092192292392492592692792892993093193293393493593693793893994094194294394494594694794894995095195295395495595695795895996096196296396496596696796896997097197297397497597697797897998098198298398498598698798898999099199299399499599699799899910001001100210031004100510061007100810091010101110121013101410151016101710181019102010211022102310241025102610271028102910301031103210331034103510361037103810391040104110421043104410451046104710481049105010511052105310541055105610571058105910601061106210631064106510661067106810691070107110721073107410751076107710781079108010811082108310841085108610871088108910901091109210931094109510961097109810991100110111021103110411051106110711081109111011111112111311141115111611171118111911201121112211231124112511261127112811291130113111321133113411351136113711381139114011411142114311441145114611471148114911501151115211531154115511561157115811591160116111621163116411651166116711681169117011711172117311741175117611771178117911801181118211831184118511861187118811891190119111921193119411951196119711981199120012011202120312041205120612071208120912101211121212131214121512161217121812191220122112221223122412251226122712281229123012311232123312341235123612371238123912401241124212431244124512461247124812491250125112521253125412551256125712581259126012611262126312641265126612671268126912701271127212731274127512761277127812791280128112821283128412851286128712881289129012911292129312941295129612971298129913001301130213031304130513061307130813091310131113121313131413151316131713181319132013211322132313241325132613271328132913301331133213331334133513361337133813391340134113421343134413451346134713481349135013511352135313541355135613571358135913601361136213631364136513661367136813691370137113721373137413751376137713781379138013811382138313841385138613871388138913901391139213931394139513961397139813991400140114021403140414051406140714081409141014111412141314141415141614171418141914201421142214231424142514261427142814291430143114321433143414351436143714381439144014411442144314441445144614471448144914501451145214531454145514561457145814591460146114621463146414651466146714681469147014711472147314741475147614771478147914801481148214831484148514861487148814891490149114921493149414951496149714981499150015011502150315041505150615071508150915101511151215131514151515161517151815191520152115221523152415251526152715281529153015311532153315341535153615371538153915401541154215431544154515461547154815491550155115521553155415551556155715581559156015611562156315641565156615671568156915701571157215731574157515761577157815791580158115821583158415851586158715881589159015911592159315941595159615971598159916001601160216031604160516061607160816091610161116121613161416151616161716181619162016211622162316241625162616271628162916301631163216331634163516361637163816391640164116421643164416451646164716481649165016511652165316541655165616571658165916601661166216631664166516661667166816691670167116721673167416751676167716781679168016811682168316841685168616871688168916901691169216931694169516961697169816991700170117021703170417051706170717081709171017111712171317141715171617171718171917201721172217231724172517261727172817291730173117321733173417351736173717381739174017411742174317441745174617471748174917501751175217531754175517561757175817591760176117621763176417651766176717681769177017711772177317741775177617771778177917801781178217831784178517861787178817891790179117921793179417951796179717981799180018011802180318041805180618071808180918101811181218131814181518161817181818191820182118221823182418251826182718281829183018311832183318341835183618371838183918401841184218431844184518461847184818491850185118521853185418551856185718581859186018611862186318641865186618671868186918701871187218731874187518761877187818791880188118821883188418851886188718881889189018911892189318941895189618971898189919001901190219031904190519061907190819091910191119121913191419151916191719181919192019211922192319241925192619271928192919301931193219331934193519361937193819391940194119421943194419451946194719481949195019511952195319541955195619571958195919601961196219631964196519661967196819691970197119721973197419751976197719781979198019811982198319841985198619871988198919901991199219931994199519961997199819992000200120022003200420052006200720082009201020112012201320142015201620172018201920202021202220232024202520262027202820292030203120322033203420352036203720382039204020412042204320442045204620472048204920502051205220532054205520562057205820592060206120622063206420652066206720682069
  1. http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-030 with
  2. a slight tweak for the patch prefix.
  3. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
  4. BASH PATCH REPORT
  5. =================
  6. Bash-Release: 4.3
  7. Patch-ID: bash43-030
  8. Bug-Reported-by: Michal Zalewski <lcamtuf@coredump.cx>
  9. Bug-Reference-ID:
  10. Bug-Reference-URL:
  11. Bug-Description:
  12. A combination of nested command substitutions and function importing from
  13. the environment can cause bash to execute code appearing in the environment
  14. variable value following the function definition.
  15. Patch (apply with `patch -p0'):
  16. *** a/builtins/evalstring.c 2014-10-01 12:57:47.000000000 -0400
  17. --- b/evalstring.c 2014-10-03 11:57:04.000000000 -0400
  18. ***************
  19. *** 309,318 ****
  20. struct fd_bitmap *bitmap;
  21. ! if ((flags & SEVAL_FUNCDEF) && command->type != cm_function_def)
  22. {
  23. ! internal_warning ("%s: ignoring function definition attempt", from_file);
  24. ! should_jump_to_top_level = 0;
  25. ! last_result = last_command_exit_value = EX_BADUSAGE;
  26. ! break;
  27. }
  28. --- 313,335 ----
  29. struct fd_bitmap *bitmap;
  30. ! if (flags & SEVAL_FUNCDEF)
  31. {
  32. ! char *x;
  33. !
  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))
  42. ! {
  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;
  46. ! reset_parser ();
  47. ! break;
  48. ! }
  49. }
  50. ***************
  51. *** 379,383 ****
  52. if (flags & SEVAL_ONECMD)
  53. ! break;
  54. }
  55. }
  56. --- 396,403 ----
  57. if (flags & SEVAL_ONECMD)
  58. ! {
  59. ! reset_parser ();
  60. ! break;
  61. ! }
  62. }
  63. }
  64. *** a/parse.y 2014-10-01 12:58:43.000000000 -0400
  65. --- b/parse.y 2014-10-03 14:48:59.000000000 -0400
  66. ***************
  67. *** 2539,2542 ****
  68. --- 2539,2552 ----
  69. }
  70. + char *
  71. + parser_remaining_input ()
  72. + {
  73. + if (shell_input_line == 0)
  74. + return 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);
  78. + }
  79. +
  80. #ifdef INCLUDE_UNUSED
  81. /* Back the input pointer up by one, effectively `ungetting' a character. */
  82. ***************
  83. *** 4028,4033 ****
  84. /* reset_parser clears shell_input_line and associated variables */
  85. restore_input_line_state (&ls);
  86. ! if (interactive)
  87. ! token_to_read = 0;
  88. /* Need to find how many characters parse_and_execute consumed, update
  89. --- 4053,4058 ----
  90. /* reset_parser clears shell_input_line and associated variables */
  91. restore_input_line_state (&ls);
  92. !
  93. ! token_to_read = 0;
  94. /* Need to find how many characters parse_and_execute consumed, update
  95. *** a/shell.h 2014-10-01 12:57:39.000000000 -0400
  96. --- b/shell.h 2014-10-03 14:49:12.000000000 -0400
  97. ***************
  98. *** 181,184 ****
  99. --- 181,186 ----
  100. /* Let's try declaring these here. */
  101. + extern char *parser_remaining_input __P((void));
  102. +
  103. extern sh_parser_state_t *save_parser_state __P((sh_parser_state_t *));
  104. extern void restore_parser_state __P((sh_parser_state_t *));
  105. *** a/y.tab.c 2014-10-01 13:09:46.000000000 -0400
  106. --- b/y.tab.c 2014-10-04 19:26:22.000000000 -0400
  107. ***************
  108. *** 169,173 ****
  109. /* Copy the first part of user declarations. */
  110. ! #line 21 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  111. #include "config.h"
  112. --- 169,173 ----
  113. /* Copy the first part of user declarations. */
  114. ! #line 21 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  115. #include "config.h"
  116. ***************
  117. *** 498,502 ****
  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. {
  122. WORD_DESC *word; /* the word that we read. */
  123. --- 498,502 ----
  124. #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
  125. typedef union YYSTYPE
  126. ! #line 329 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  127. {
  128. WORD_DESC *word; /* the word that we read. */
  129. ***************
  130. *** 2099,2103 ****
  131. {
  132. case 2:
  133. ! #line 383 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  134. {
  135. /* Case of regular command. Discard the error
  136. --- 2099,2103 ----
  137. {
  138. case 2:
  139. ! #line 383 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  140. {
  141. /* Case of regular command. Discard the error
  142. ***************
  143. *** 2113,2117 ****
  144. case 3:
  145. ! #line 394 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  146. {
  147. /* Case of regular command, but not a very
  148. --- 2113,2117 ----
  149. case 3:
  150. ! #line 394 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  151. {
  152. /* Case of regular command, but not a very
  153. ***************
  154. *** 2125,2129 ****
  155. case 4:
  156. ! #line 403 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  157. {
  158. /* Error during parsing. Return NULL command. */
  159. --- 2125,2129 ----
  160. case 4:
  161. ! #line 403 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  162. {
  163. /* Error during parsing. Return NULL command. */
  164. ***************
  165. *** 2143,2147 ****
  166. case 5:
  167. ! #line 418 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  168. {
  169. /* Case of EOF seen by itself. Do ignoreeof or
  170. --- 2143,2147 ----
  171. case 5:
  172. ! #line 418 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  173. {
  174. /* Case of EOF seen by itself. Do ignoreeof or
  175. ***************
  176. *** 2154,2168 ****
  177. case 6:
  178. ! #line 428 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  179. { (yyval.word_list) = make_word_list ((yyvsp[(1) - (1)].word), (WORD_LIST *)NULL); }
  180. break;
  181. case 7:
  182. ! #line 430 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  183. { (yyval.word_list) = make_word_list ((yyvsp[(2) - (2)].word), (yyvsp[(1) - (2)].word_list)); }
  184. break;
  185. case 8:
  186. ! #line 434 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  187. {
  188. source.dest = 1;
  189. --- 2154,2168 ----
  190. case 6:
  191. ! #line 428 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  192. { (yyval.word_list) = make_word_list ((yyvsp[(1) - (1)].word), (WORD_LIST *)NULL); }
  193. break;
  194. case 7:
  195. ! #line 430 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  196. { (yyval.word_list) = make_word_list ((yyvsp[(2) - (2)].word), (yyvsp[(1) - (2)].word_list)); }
  197. break;
  198. case 8:
  199. ! #line 434 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  200. {
  201. source.dest = 1;
  202. ***************
  203. *** 2173,2177 ****
  204. case 9:
  205. ! #line 440 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  206. {
  207. source.dest = 0;
  208. --- 2173,2177 ----
  209. case 9:
  210. ! #line 440 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  211. {
  212. source.dest = 0;
  213. ***************
  214. *** 2182,2186 ****
  215. case 10:
  216. ! #line 446 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  217. {
  218. source.dest = (yyvsp[(1) - (3)].number);
  219. --- 2182,2186 ----
  220. case 10:
  221. ! #line 446 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  222. {
  223. source.dest = (yyvsp[(1) - (3)].number);
  224. ***************
  225. *** 2191,2195 ****
  226. case 11:
  227. ! #line 452 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  228. {
  229. source.dest = (yyvsp[(1) - (3)].number);
  230. --- 2191,2195 ----
  231. case 11:
  232. ! #line 452 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  233. {
  234. source.dest = (yyvsp[(1) - (3)].number);
  235. ***************
  236. *** 2200,2204 ****
  237. case 12:
  238. ! #line 458 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  239. {
  240. source.filename = (yyvsp[(1) - (3)].word);
  241. --- 2200,2204 ----
  242. case 12:
  243. ! #line 458 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  244. {
  245. source.filename = (yyvsp[(1) - (3)].word);
  246. ***************
  247. *** 2209,2213 ****
  248. case 13:
  249. ! #line 464 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  250. {
  251. source.filename = (yyvsp[(1) - (3)].word);
  252. --- 2209,2213 ----
  253. case 13:
  254. ! #line 464 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  255. {
  256. source.filename = (yyvsp[(1) - (3)].word);
  257. ***************
  258. *** 2218,2222 ****
  259. case 14:
  260. ! #line 470 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  261. {
  262. source.dest = 1;
  263. --- 2218,2222 ----
  264. case 14:
  265. ! #line 470 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  266. {
  267. source.dest = 1;
  268. ***************
  269. *** 2227,2231 ****
  270. case 15:
  271. ! #line 476 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  272. {
  273. source.dest = (yyvsp[(1) - (3)].number);
  274. --- 2227,2231 ----
  275. case 15:
  276. ! #line 476 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  277. {
  278. source.dest = (yyvsp[(1) - (3)].number);
  279. ***************
  280. *** 2236,2240 ****
  281. case 16:
  282. ! #line 482 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  283. {
  284. source.filename = (yyvsp[(1) - (3)].word);
  285. --- 2236,2240 ----
  286. case 16:
  287. ! #line 482 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  288. {
  289. source.filename = (yyvsp[(1) - (3)].word);
  290. ***************
  291. *** 2245,2249 ****
  292. case 17:
  293. ! #line 488 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  294. {
  295. source.dest = 1;
  296. --- 2245,2249 ----
  297. case 17:
  298. ! #line 488 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  299. {
  300. source.dest = 1;
  301. ***************
  302. *** 2254,2258 ****
  303. case 18:
  304. ! #line 494 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  305. {
  306. source.dest = (yyvsp[(1) - (3)].number);
  307. --- 2254,2258 ----
  308. case 18:
  309. ! #line 494 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  310. {
  311. source.dest = (yyvsp[(1) - (3)].number);
  312. ***************
  313. *** 2263,2267 ****
  314. case 19:
  315. ! #line 500 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  316. {
  317. source.filename = (yyvsp[(1) - (3)].word);
  318. --- 2263,2267 ----
  319. case 19:
  320. ! #line 500 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  321. {
  322. source.filename = (yyvsp[(1) - (3)].word);
  323. ***************
  324. *** 2272,2276 ****
  325. case 20:
  326. ! #line 506 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  327. {
  328. source.dest = 0;
  329. --- 2272,2276 ----
  330. case 20:
  331. ! #line 506 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  332. {
  333. source.dest = 0;
  334. ***************
  335. *** 2281,2285 ****
  336. case 21:
  337. ! #line 512 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  338. {
  339. source.dest = (yyvsp[(1) - (3)].number);
  340. --- 2281,2285 ----
  341. case 21:
  342. ! #line 512 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  343. {
  344. source.dest = (yyvsp[(1) - (3)].number);
  345. ***************
  346. *** 2290,2294 ****
  347. case 22:
  348. ! #line 518 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  349. {
  350. source.filename = (yyvsp[(1) - (3)].word);
  351. --- 2290,2294 ----
  352. case 22:
  353. ! #line 518 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  354. {
  355. source.filename = (yyvsp[(1) - (3)].word);
  356. ***************
  357. *** 2299,2303 ****
  358. case 23:
  359. ! #line 524 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  360. {
  361. source.dest = 0;
  362. --- 2299,2303 ----
  363. case 23:
  364. ! #line 524 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  365. {
  366. source.dest = 0;
  367. ***************
  368. *** 2309,2313 ****
  369. case 24:
  370. ! #line 531 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  371. {
  372. source.dest = (yyvsp[(1) - (3)].number);
  373. --- 2309,2313 ----
  374. case 24:
  375. ! #line 531 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  376. {
  377. source.dest = (yyvsp[(1) - (3)].number);
  378. ***************
  379. *** 2319,2323 ****
  380. case 25:
  381. ! #line 538 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  382. {
  383. source.filename = (yyvsp[(1) - (3)].word);
  384. --- 2319,2323 ----
  385. case 25:
  386. ! #line 538 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  387. {
  388. source.filename = (yyvsp[(1) - (3)].word);
  389. ***************
  390. *** 2329,2333 ****
  391. case 26:
  392. ! #line 545 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  393. {
  394. source.dest = 0;
  395. --- 2329,2333 ----
  396. case 26:
  397. ! #line 545 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  398. {
  399. source.dest = 0;
  400. ***************
  401. *** 2339,2343 ****
  402. case 27:
  403. ! #line 552 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  404. {
  405. source.dest = (yyvsp[(1) - (3)].number);
  406. --- 2339,2343 ----
  407. case 27:
  408. ! #line 552 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  409. {
  410. source.dest = (yyvsp[(1) - (3)].number);
  411. ***************
  412. *** 2349,2353 ****
  413. case 28:
  414. ! #line 559 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  415. {
  416. source.filename = (yyvsp[(1) - (3)].word);
  417. --- 2349,2353 ----
  418. case 28:
  419. ! #line 559 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  420. {
  421. source.filename = (yyvsp[(1) - (3)].word);
  422. ***************
  423. *** 2359,2363 ****
  424. case 29:
  425. ! #line 566 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  426. {
  427. source.dest = 0;
  428. --- 2359,2363 ----
  429. case 29:
  430. ! #line 566 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  431. {
  432. source.dest = 0;
  433. ***************
  434. *** 2368,2372 ****
  435. case 30:
  436. ! #line 572 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  437. {
  438. source.dest = (yyvsp[(1) - (3)].number);
  439. --- 2368,2372 ----
  440. case 30:
  441. ! #line 572 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  442. {
  443. source.dest = (yyvsp[(1) - (3)].number);
  444. ***************
  445. *** 2377,2381 ****
  446. case 31:
  447. ! #line 578 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  448. {
  449. source.filename = (yyvsp[(1) - (3)].word);
  450. --- 2377,2381 ----
  451. case 31:
  452. ! #line 578 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  453. {
  454. source.filename = (yyvsp[(1) - (3)].word);
  455. ***************
  456. *** 2386,2390 ****
  457. case 32:
  458. ! #line 584 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  459. {
  460. source.dest = 0;
  461. --- 2386,2390 ----
  462. case 32:
  463. ! #line 584 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  464. {
  465. source.dest = 0;
  466. ***************
  467. *** 2395,2399 ****
  468. case 33:
  469. ! #line 590 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  470. {
  471. source.dest = (yyvsp[(1) - (3)].number);
  472. --- 2395,2399 ----
  473. case 33:
  474. ! #line 590 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  475. {
  476. source.dest = (yyvsp[(1) - (3)].number);
  477. ***************
  478. *** 2404,2408 ****
  479. case 34:
  480. ! #line 596 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  481. {
  482. source.filename = (yyvsp[(1) - (3)].word);
  483. --- 2404,2408 ----
  484. case 34:
  485. ! #line 596 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  486. {
  487. source.filename = (yyvsp[(1) - (3)].word);
  488. ***************
  489. *** 2413,2417 ****
  490. case 35:
  491. ! #line 602 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  492. {
  493. source.dest = 1;
  494. --- 2413,2417 ----
  495. case 35:
  496. ! #line 602 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  497. {
  498. source.dest = 1;
  499. ***************
  500. *** 2422,2426 ****
  501. case 36:
  502. ! #line 608 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  503. {
  504. source.dest = (yyvsp[(1) - (3)].number);
  505. --- 2422,2426 ----
  506. case 36:
  507. ! #line 608 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  508. {
  509. source.dest = (yyvsp[(1) - (3)].number);
  510. ***************
  511. *** 2431,2435 ****
  512. case 37:
  513. ! #line 614 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  514. {
  515. source.filename = (yyvsp[(1) - (3)].word);
  516. --- 2431,2435 ----
  517. case 37:
  518. ! #line 614 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  519. {
  520. source.filename = (yyvsp[(1) - (3)].word);
  521. ***************
  522. *** 2440,2444 ****
  523. case 38:
  524. ! #line 620 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  525. {
  526. source.dest = 0;
  527. --- 2440,2444 ----
  528. case 38:
  529. ! #line 620 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  530. {
  531. source.dest = 0;
  532. ***************
  533. *** 2449,2453 ****
  534. case 39:
  535. ! #line 626 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  536. {
  537. source.dest = (yyvsp[(1) - (3)].number);
  538. --- 2449,2453 ----
  539. case 39:
  540. ! #line 626 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  541. {
  542. source.dest = (yyvsp[(1) - (3)].number);
  543. ***************
  544. *** 2458,2462 ****
  545. case 40:
  546. ! #line 632 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  547. {
  548. source.filename = (yyvsp[(1) - (3)].word);
  549. --- 2458,2462 ----
  550. case 40:
  551. ! #line 632 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  552. {
  553. source.filename = (yyvsp[(1) - (3)].word);
  554. ***************
  555. *** 2467,2471 ****
  556. case 41:
  557. ! #line 638 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  558. {
  559. source.dest = 1;
  560. --- 2467,2471 ----
  561. case 41:
  562. ! #line 638 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  563. {
  564. source.dest = 1;
  565. ***************
  566. *** 2476,2480 ****
  567. case 42:
  568. ! #line 644 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  569. {
  570. source.dest = (yyvsp[(1) - (3)].number);
  571. --- 2476,2480 ----
  572. case 42:
  573. ! #line 644 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  574. {
  575. source.dest = (yyvsp[(1) - (3)].number);
  576. ***************
  577. *** 2485,2489 ****
  578. case 43:
  579. ! #line 650 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  580. {
  581. source.filename = (yyvsp[(1) - (3)].word);
  582. --- 2485,2489 ----
  583. case 43:
  584. ! #line 650 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  585. {
  586. source.filename = (yyvsp[(1) - (3)].word);
  587. ***************
  588. *** 2494,2498 ****
  589. case 44:
  590. ! #line 656 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  591. {
  592. source.dest = 1;
  593. --- 2494,2498 ----
  594. case 44:
  595. ! #line 656 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  596. {
  597. source.dest = 1;
  598. ***************
  599. *** 2503,2507 ****
  600. case 45:
  601. ! #line 662 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  602. {
  603. source.dest = (yyvsp[(1) - (3)].number);
  604. --- 2503,2507 ----
  605. case 45:
  606. ! #line 662 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  607. {
  608. source.dest = (yyvsp[(1) - (3)].number);
  609. ***************
  610. *** 2512,2516 ****
  611. case 46:
  612. ! #line 668 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  613. {
  614. source.filename = (yyvsp[(1) - (3)].word);
  615. --- 2512,2516 ----
  616. case 46:
  617. ! #line 668 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  618. {
  619. source.filename = (yyvsp[(1) - (3)].word);
  620. ***************
  621. *** 2521,2525 ****
  622. case 47:
  623. ! #line 674 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  624. {
  625. source.dest = 0;
  626. --- 2521,2525 ----
  627. case 47:
  628. ! #line 674 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  629. {
  630. source.dest = 0;
  631. ***************
  632. *** 2530,2534 ****
  633. case 48:
  634. ! #line 680 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  635. {
  636. source.dest = (yyvsp[(1) - (3)].number);
  637. --- 2530,2534 ----
  638. case 48:
  639. ! #line 680 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  640. {
  641. source.dest = (yyvsp[(1) - (3)].number);
  642. ***************
  643. *** 2539,2543 ****
  644. case 49:
  645. ! #line 686 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  646. {
  647. source.filename = (yyvsp[(1) - (3)].word);
  648. --- 2539,2543 ----
  649. case 49:
  650. ! #line 686 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  651. {
  652. source.filename = (yyvsp[(1) - (3)].word);
  653. ***************
  654. *** 2548,2552 ****
  655. case 50:
  656. ! #line 692 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  657. {
  658. source.dest = 1;
  659. --- 2548,2552 ----
  660. case 50:
  661. ! #line 692 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  662. {
  663. source.dest = 1;
  664. ***************
  665. *** 2557,2561 ****
  666. case 51:
  667. ! #line 698 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  668. {
  669. source.dest = 1;
  670. --- 2557,2561 ----
  671. case 51:
  672. ! #line 698 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  673. {
  674. source.dest = 1;
  675. ***************
  676. *** 2566,2585 ****
  677. case 52:
  678. ! #line 706 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  679. { (yyval.element).word = (yyvsp[(1) - (1)].word); (yyval.element).redirect = 0; }
  680. break;
  681. case 53:
  682. ! #line 708 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  683. { (yyval.element).word = (yyvsp[(1) - (1)].word); (yyval.element).redirect = 0; }
  684. break;
  685. case 54:
  686. ! #line 710 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  687. { (yyval.element).redirect = (yyvsp[(1) - (1)].redirect); (yyval.element).word = 0; }
  688. break;
  689. case 55:
  690. ! #line 714 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  691. {
  692. (yyval.redirect) = (yyvsp[(1) - (1)].redirect);
  693. --- 2566,2585 ----
  694. case 52:
  695. ! #line 706 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  696. { (yyval.element).word = (yyvsp[(1) - (1)].word); (yyval.element).redirect = 0; }
  697. break;
  698. case 53:
  699. ! #line 708 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  700. { (yyval.element).word = (yyvsp[(1) - (1)].word); (yyval.element).redirect = 0; }
  701. break;
  702. case 54:
  703. ! #line 710 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  704. { (yyval.element).redirect = (yyvsp[(1) - (1)].redirect); (yyval.element).word = 0; }
  705. break;
  706. case 55:
  707. ! #line 714 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  708. {
  709. (yyval.redirect) = (yyvsp[(1) - (1)].redirect);
  710. ***************
  711. *** 2588,2592 ****
  712. case 56:
  713. ! #line 718 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  714. {
  715. register REDIRECT *t;
  716. --- 2588,2592 ----
  717. case 56:
  718. ! #line 718 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  719. {
  720. register REDIRECT *t;
  721. ***************
  722. *** 2600,2624 ****
  723. case 57:
  724. ! #line 729 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  725. { (yyval.command) = make_simple_command ((yyvsp[(1) - (1)].element), (COMMAND *)NULL); }
  726. break;
  727. case 58:
  728. ! #line 731 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  729. { (yyval.command) = make_simple_command ((yyvsp[(2) - (2)].element), (yyvsp[(1) - (2)].command)); }
  730. break;
  731. case 59:
  732. ! #line 735 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  733. { (yyval.command) = clean_simple_command ((yyvsp[(1) - (1)].command)); }
  734. break;
  735. case 60:
  736. ! #line 737 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  737. { (yyval.command) = (yyvsp[(1) - (1)].command); }
  738. break;
  739. case 61:
  740. ! #line 739 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  741. {
  742. COMMAND *tc;
  743. --- 2600,2624 ----
  744. case 57:
  745. ! #line 729 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  746. { (yyval.command) = make_simple_command ((yyvsp[(1) - (1)].element), (COMMAND *)NULL); }
  747. break;
  748. case 58:
  749. ! #line 731 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  750. { (yyval.command) = make_simple_command ((yyvsp[(2) - (2)].element), (yyvsp[(1) - (2)].command)); }
  751. break;
  752. case 59:
  753. ! #line 735 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  754. { (yyval.command) = clean_simple_command ((yyvsp[(1) - (1)].command)); }
  755. break;
  756. case 60:
  757. ! #line 737 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  758. { (yyval.command) = (yyvsp[(1) - (1)].command); }
  759. break;
  760. case 61:
  761. ! #line 739 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  762. {
  763. COMMAND *tc;
  764. ***************
  765. *** 2639,2708 ****
  766. case 62:
  767. ! #line 755 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  768. { (yyval.command) = (yyvsp[(1) - (1)].command); }
  769. break;
  770. case 63:
  771. ! #line 757 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  772. { (yyval.command) = (yyvsp[(1) - (1)].command); }
  773. break;
  774. case 64:
  775. ! #line 761 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  776. { (yyval.command) = (yyvsp[(1) - (1)].command); }
  777. break;
  778. case 65:
  779. ! #line 763 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  780. { (yyval.command) = (yyvsp[(1) - (1)].command); }
  781. break;
  782. case 66:
  783. ! #line 765 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  784. { (yyval.command) = make_while_command ((yyvsp[(2) - (5)].command), (yyvsp[(4) - (5)].command)); }
  785. break;
  786. case 67:
  787. ! #line 767 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  788. { (yyval.command) = make_until_command ((yyvsp[(2) - (5)].command), (yyvsp[(4) - (5)].command)); }
  789. break;
  790. case 68:
  791. ! #line 769 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  792. { (yyval.command) = (yyvsp[(1) - (1)].command); }
  793. break;
  794. case 69:
  795. ! #line 771 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  796. { (yyval.command) = (yyvsp[(1) - (1)].command); }
  797. break;
  798. case 70:
  799. ! #line 773 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  800. { (yyval.command) = (yyvsp[(1) - (1)].command); }
  801. break;
  802. case 71:
  803. ! #line 775 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  804. { (yyval.command) = (yyvsp[(1) - (1)].command); }
  805. break;
  806. case 72:
  807. ! #line 777 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  808. { (yyval.command) = (yyvsp[(1) - (1)].command); }
  809. break;
  810. case 73:
  811. ! #line 779 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  812. { (yyval.command) = (yyvsp[(1) - (1)].command); }
  813. break;
  814. case 74:
  815. ! #line 781 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  816. { (yyval.command) = (yyvsp[(1) - (1)].command); }
  817. break;
  818. case 75:
  819. ! #line 785 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  820. {
  821. (yyval.command) = make_for_command ((yyvsp[(2) - (6)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(5) - (6)].command), word_lineno[word_top]);
  822. --- 2639,2708 ----
  823. case 62:
  824. ! #line 755 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  825. { (yyval.command) = (yyvsp[(1) - (1)].command); }
  826. break;
  827. case 63:
  828. ! #line 757 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  829. { (yyval.command) = (yyvsp[(1) - (1)].command); }
  830. break;
  831. case 64:
  832. ! #line 761 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  833. { (yyval.command) = (yyvsp[(1) - (1)].command); }
  834. break;
  835. case 65:
  836. ! #line 763 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  837. { (yyval.command) = (yyvsp[(1) - (1)].command); }
  838. break;
  839. case 66:
  840. ! #line 765 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  841. { (yyval.command) = make_while_command ((yyvsp[(2) - (5)].command), (yyvsp[(4) - (5)].command)); }
  842. break;
  843. case 67:
  844. ! #line 767 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  845. { (yyval.command) = make_until_command ((yyvsp[(2) - (5)].command), (yyvsp[(4) - (5)].command)); }
  846. break;
  847. case 68:
  848. ! #line 769 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  849. { (yyval.command) = (yyvsp[(1) - (1)].command); }
  850. break;
  851. case 69:
  852. ! #line 771 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  853. { (yyval.command) = (yyvsp[(1) - (1)].command); }
  854. break;
  855. case 70:
  856. ! #line 773 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  857. { (yyval.command) = (yyvsp[(1) - (1)].command); }
  858. break;
  859. case 71:
  860. ! #line 775 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  861. { (yyval.command) = (yyvsp[(1) - (1)].command); }
  862. break;
  863. case 72:
  864. ! #line 777 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  865. { (yyval.command) = (yyvsp[(1) - (1)].command); }
  866. break;
  867. case 73:
  868. ! #line 779 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  869. { (yyval.command) = (yyvsp[(1) - (1)].command); }
  870. break;
  871. case 74:
  872. ! #line 781 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  873. { (yyval.command) = (yyvsp[(1) - (1)].command); }
  874. break;
  875. case 75:
  876. ! #line 785 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  877. {
  878. (yyval.command) = make_for_command ((yyvsp[(2) - (6)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(5) - (6)].command), word_lineno[word_top]);
  879. ***************
  880. *** 2712,2716 ****
  881. case 76:
  882. ! #line 790 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  883. {
  884. (yyval.command) = make_for_command ((yyvsp[(2) - (6)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(5) - (6)].command), word_lineno[word_top]);
  885. --- 2712,2716 ----
  886. case 76:
  887. ! #line 790 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  888. {
  889. (yyval.command) = make_for_command ((yyvsp[(2) - (6)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(5) - (6)].command), word_lineno[word_top]);
  890. ***************
  891. *** 2720,2724 ****
  892. case 77:
  893. ! #line 795 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  894. {
  895. (yyval.command) = make_for_command ((yyvsp[(2) - (7)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(6) - (7)].command), word_lineno[word_top]);
  896. --- 2720,2724 ----
  897. case 77:
  898. ! #line 795 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  899. {
  900. (yyval.command) = make_for_command ((yyvsp[(2) - (7)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(6) - (7)].command), word_lineno[word_top]);
  901. ***************
  902. *** 2728,2732 ****
  903. case 78:
  904. ! #line 800 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  905. {
  906. (yyval.command) = make_for_command ((yyvsp[(2) - (7)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(6) - (7)].command), word_lineno[word_top]);
  907. --- 2728,2732 ----
  908. case 78:
  909. ! #line 800 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  910. {
  911. (yyval.command) = make_for_command ((yyvsp[(2) - (7)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(6) - (7)].command), word_lineno[word_top]);
  912. ***************
  913. *** 2736,2740 ****
  914. case 79:
  915. ! #line 805 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  916. {
  917. (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]);
  918. --- 2736,2740 ----
  919. case 79:
  920. ! #line 805 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  921. {
  922. (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]);
  923. ***************
  924. *** 2744,2748 ****
  925. case 80:
  926. ! #line 810 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  927. {
  928. (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]);
  929. --- 2744,2748 ----
  930. case 80:
  931. ! #line 810 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  932. {
  933. (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]);
  934. ***************
  935. *** 2752,2756 ****
  936. case 81:
  937. ! #line 815 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  938. {
  939. (yyval.command) = make_for_command ((yyvsp[(2) - (9)].word), (WORD_LIST *)NULL, (yyvsp[(8) - (9)].command), word_lineno[word_top]);
  940. --- 2752,2756 ----
  941. case 81:
  942. ! #line 815 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  943. {
  944. (yyval.command) = make_for_command ((yyvsp[(2) - (9)].word), (WORD_LIST *)NULL, (yyvsp[(8) - (9)].command), word_lineno[word_top]);
  945. ***************
  946. *** 2760,2764 ****
  947. case 82:
  948. ! #line 820 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  949. {
  950. (yyval.command) = make_for_command ((yyvsp[(2) - (9)].word), (WORD_LIST *)NULL, (yyvsp[(8) - (9)].command), word_lineno[word_top]);
  951. --- 2760,2764 ----
  952. case 82:
  953. ! #line 820 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  954. {
  955. (yyval.command) = make_for_command ((yyvsp[(2) - (9)].word), (WORD_LIST *)NULL, (yyvsp[(8) - (9)].command), word_lineno[word_top]);
  956. ***************
  957. *** 2768,2772 ****
  958. case 83:
  959. ! #line 827 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  960. {
  961. (yyval.command) = make_arith_for_command ((yyvsp[(2) - (7)].word_list), (yyvsp[(6) - (7)].command), arith_for_lineno);
  962. --- 2768,2772 ----
  963. case 83:
  964. ! #line 827 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  965. {
  966. (yyval.command) = make_arith_for_command ((yyvsp[(2) - (7)].word_list), (yyvsp[(6) - (7)].command), arith_for_lineno);
  967. ***************
  968. *** 2776,2780 ****
  969. case 84:
  970. ! #line 832 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  971. {
  972. (yyval.command) = make_arith_for_command ((yyvsp[(2) - (7)].word_list), (yyvsp[(6) - (7)].command), arith_for_lineno);
  973. --- 2776,2780 ----
  974. case 84:
  975. ! #line 832 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  976. {
  977. (yyval.command) = make_arith_for_command ((yyvsp[(2) - (7)].word_list), (yyvsp[(6) - (7)].command), arith_for_lineno);
  978. ***************
  979. *** 2784,2788 ****
  980. case 85:
  981. ! #line 837 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  982. {
  983. (yyval.command) = make_arith_for_command ((yyvsp[(2) - (5)].word_list), (yyvsp[(4) - (5)].command), arith_for_lineno);
  984. --- 2784,2788 ----
  985. case 85:
  986. ! #line 837 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  987. {
  988. (yyval.command) = make_arith_for_command ((yyvsp[(2) - (5)].word_list), (yyvsp[(4) - (5)].command), arith_for_lineno);
  989. ***************
  990. *** 2792,2796 ****
  991. case 86:
  992. ! #line 842 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  993. {
  994. (yyval.command) = make_arith_for_command ((yyvsp[(2) - (5)].word_list), (yyvsp[(4) - (5)].command), arith_for_lineno);
  995. --- 2792,2796 ----
  996. case 86:
  997. ! #line 842 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  998. {
  999. (yyval.command) = make_arith_for_command ((yyvsp[(2) - (5)].word_list), (yyvsp[(4) - (5)].command), arith_for_lineno);
  1000. ***************
  1001. *** 2800,2804 ****
  1002. case 87:
  1003. ! #line 849 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1004. {
  1005. (yyval.command) = make_select_command ((yyvsp[(2) - (6)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(5) - (6)].command), word_lineno[word_top]);
  1006. --- 2800,2804 ----
  1007. case 87:
  1008. ! #line 849 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1009. {
  1010. (yyval.command) = make_select_command ((yyvsp[(2) - (6)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(5) - (6)].command), word_lineno[word_top]);
  1011. ***************
  1012. *** 2808,2812 ****
  1013. case 88:
  1014. ! #line 854 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1015. {
  1016. (yyval.command) = make_select_command ((yyvsp[(2) - (6)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(5) - (6)].command), word_lineno[word_top]);
  1017. --- 2808,2812 ----
  1018. case 88:
  1019. ! #line 854 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1020. {
  1021. (yyval.command) = make_select_command ((yyvsp[(2) - (6)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(5) - (6)].command), word_lineno[word_top]);
  1022. ***************
  1023. *** 2816,2820 ****
  1024. case 89:
  1025. ! #line 859 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1026. {
  1027. (yyval.command) = make_select_command ((yyvsp[(2) - (7)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(6) - (7)].command), word_lineno[word_top]);
  1028. --- 2816,2820 ----
  1029. case 89:
  1030. ! #line 859 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1031. {
  1032. (yyval.command) = make_select_command ((yyvsp[(2) - (7)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(6) - (7)].command), word_lineno[word_top]);
  1033. ***************
  1034. *** 2824,2828 ****
  1035. case 90:
  1036. ! #line 864 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1037. {
  1038. (yyval.command) = make_select_command ((yyvsp[(2) - (7)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(6) - (7)].command), word_lineno[word_top]);
  1039. --- 2824,2828 ----
  1040. case 90:
  1041. ! #line 864 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1042. {
  1043. (yyval.command) = make_select_command ((yyvsp[(2) - (7)].word), add_string_to_list ("\"$@\"", (WORD_LIST *)NULL), (yyvsp[(6) - (7)].command), word_lineno[word_top]);
  1044. ***************
  1045. *** 2832,2836 ****
  1046. case 91:
  1047. ! #line 869 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1048. {
  1049. (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]);
  1050. --- 2832,2836 ----
  1051. case 91:
  1052. ! #line 869 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1053. {
  1054. (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]);
  1055. ***************
  1056. *** 2840,2844 ****
  1057. case 92:
  1058. ! #line 874 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1059. {
  1060. (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]);
  1061. --- 2840,2844 ----
  1062. case 92:
  1063. ! #line 874 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1064. {
  1065. (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]);
  1066. ***************
  1067. *** 2848,2852 ****
  1068. case 93:
  1069. ! #line 881 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1070. {
  1071. (yyval.command) = make_case_command ((yyvsp[(2) - (6)].word), (PATTERN_LIST *)NULL, word_lineno[word_top]);
  1072. --- 2848,2852 ----
  1073. case 93:
  1074. ! #line 881 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1075. {
  1076. (yyval.command) = make_case_command ((yyvsp[(2) - (6)].word), (PATTERN_LIST *)NULL, word_lineno[word_top]);
  1077. ***************
  1078. *** 2856,2860 ****
  1079. case 94:
  1080. ! #line 886 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1081. {
  1082. (yyval.command) = make_case_command ((yyvsp[(2) - (7)].word), (yyvsp[(5) - (7)].pattern), word_lineno[word_top]);
  1083. --- 2856,2860 ----
  1084. case 94:
  1085. ! #line 886 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1086. {
  1087. (yyval.command) = make_case_command ((yyvsp[(2) - (7)].word), (yyvsp[(5) - (7)].pattern), word_lineno[word_top]);
  1088. ***************
  1089. *** 2864,2868 ****
  1090. case 95:
  1091. ! #line 891 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1092. {
  1093. (yyval.command) = make_case_command ((yyvsp[(2) - (6)].word), (yyvsp[(5) - (6)].pattern), word_lineno[word_top]);
  1094. --- 2864,2868 ----
  1095. case 95:
  1096. ! #line 891 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1097. {
  1098. (yyval.command) = make_case_command ((yyvsp[(2) - (6)].word), (yyvsp[(5) - (6)].pattern), word_lineno[word_top]);
  1099. ***************
  1100. *** 2872,2896 ****
  1101. case 96:
  1102. ! #line 898 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1103. { (yyval.command) = make_function_def ((yyvsp[(1) - (5)].word), (yyvsp[(5) - (5)].command), function_dstart, function_bstart); }
  1104. break;
  1105. case 97:
  1106. ! #line 901 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1107. { (yyval.command) = make_function_def ((yyvsp[(2) - (6)].word), (yyvsp[(6) - (6)].command), function_dstart, function_bstart); }
  1108. break;
  1109. case 98:
  1110. ! #line 904 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1111. { (yyval.command) = make_function_def ((yyvsp[(2) - (4)].word), (yyvsp[(4) - (4)].command), function_dstart, function_bstart); }
  1112. break;
  1113. case 99:
  1114. ! #line 908 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1115. { (yyval.command) = (yyvsp[(1) - (1)].command); }
  1116. break;
  1117. case 100:
  1118. ! #line 910 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1119. {
  1120. COMMAND *tc;
  1121. --- 2872,2896 ----
  1122. case 96:
  1123. ! #line 898 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1124. { (yyval.command) = make_function_def ((yyvsp[(1) - (5)].word), (yyvsp[(5) - (5)].command), function_dstart, function_bstart); }
  1125. break;
  1126. case 97:
  1127. ! #line 901 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1128. { (yyval.command) = make_function_def ((yyvsp[(2) - (6)].word), (yyvsp[(6) - (6)].command), function_dstart, function_bstart); }
  1129. break;
  1130. case 98:
  1131. ! #line 904 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1132. { (yyval.command) = make_function_def ((yyvsp[(2) - (4)].word), (yyvsp[(4) - (4)].command), function_dstart, function_bstart); }
  1133. break;
  1134. case 99:
  1135. ! #line 908 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1136. { (yyval.command) = (yyvsp[(1) - (1)].command); }
  1137. break;
  1138. case 100:
  1139. ! #line 910 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1140. {
  1141. COMMAND *tc;
  1142. ***************
  1143. *** 2924,2928 ****
  1144. case 101:
  1145. ! #line 941 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1146. {
  1147. (yyval.command) = make_subshell_command ((yyvsp[(2) - (3)].command));
  1148. --- 2924,2928 ----
  1149. case 101:
  1150. ! #line 941 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1151. {
  1152. (yyval.command) = make_subshell_command ((yyvsp[(2) - (3)].command));
  1153. ***************
  1154. *** 2932,2936 ****
  1155. case 102:
  1156. ! #line 948 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1157. {
  1158. (yyval.command) = make_coproc_command ("COPROC", (yyvsp[(2) - (2)].command));
  1159. --- 2932,2936 ----
  1160. case 102:
  1161. ! #line 948 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1162. {
  1163. (yyval.command) = make_coproc_command ("COPROC", (yyvsp[(2) - (2)].command));
  1164. ***************
  1165. *** 2940,2944 ****
  1166. case 103:
  1167. ! #line 953 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1168. {
  1169. COMMAND *tc;
  1170. --- 2940,2944 ----
  1171. case 103:
  1172. ! #line 953 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1173. {
  1174. COMMAND *tc;
  1175. ***************
  1176. *** 2960,2964 ****
  1177. case 104:
  1178. ! #line 970 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1179. {
  1180. (yyval.command) = make_coproc_command ((yyvsp[(2) - (3)].word)->word, (yyvsp[(3) - (3)].command));
  1181. --- 2960,2964 ----
  1182. case 104:
  1183. ! #line 970 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1184. {
  1185. (yyval.command) = make_coproc_command ((yyvsp[(2) - (3)].word)->word, (yyvsp[(3) - (3)].command));
  1186. ***************
  1187. *** 2968,2972 ****
  1188. case 105:
  1189. ! #line 975 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1190. {
  1191. COMMAND *tc;
  1192. --- 2968,2972 ----
  1193. case 105:
  1194. ! #line 975 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1195. {
  1196. COMMAND *tc;
  1197. ***************
  1198. *** 2988,2992 ****
  1199. case 106:
  1200. ! #line 992 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1201. {
  1202. (yyval.command) = make_coproc_command ("COPROC", clean_simple_command ((yyvsp[(2) - (2)].command)));
  1203. --- 2988,2992 ----
  1204. case 106:
  1205. ! #line 992 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1206. {
  1207. (yyval.command) = make_coproc_command ("COPROC", clean_simple_command ((yyvsp[(2) - (2)].command)));
  1208. ***************
  1209. *** 2996,3110 ****
  1210. case 107:
  1211. ! #line 999 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1212. { (yyval.command) = make_if_command ((yyvsp[(2) - (5)].command), (yyvsp[(4) - (5)].command), (COMMAND *)NULL); }
  1213. break;
  1214. case 108:
  1215. ! #line 1001 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1216. { (yyval.command) = make_if_command ((yyvsp[(2) - (7)].command), (yyvsp[(4) - (7)].command), (yyvsp[(6) - (7)].command)); }
  1217. break;
  1218. case 109:
  1219. ! #line 1003 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1220. { (yyval.command) = make_if_command ((yyvsp[(2) - (6)].command), (yyvsp[(4) - (6)].command), (yyvsp[(5) - (6)].command)); }
  1221. break;
  1222. case 110:
  1223. ! #line 1008 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1224. { (yyval.command) = make_group_command ((yyvsp[(2) - (3)].command)); }
  1225. break;
  1226. case 111:
  1227. ! #line 1012 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1228. { (yyval.command) = make_arith_command ((yyvsp[(1) - (1)].word_list)); }
  1229. break;
  1230. case 112:
  1231. ! #line 1016 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1232. { (yyval.command) = (yyvsp[(2) - (3)].command); }
  1233. break;
  1234. case 113:
  1235. ! #line 1020 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1236. { (yyval.command) = make_if_command ((yyvsp[(2) - (4)].command), (yyvsp[(4) - (4)].command), (COMMAND *)NULL); }
  1237. break;
  1238. case 114:
  1239. ! #line 1022 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1240. { (yyval.command) = make_if_command ((yyvsp[(2) - (6)].command), (yyvsp[(4) - (6)].command), (yyvsp[(6) - (6)].command)); }
  1241. break;
  1242. case 115:
  1243. ! #line 1024 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1244. { (yyval.command) = make_if_command ((yyvsp[(2) - (5)].command), (yyvsp[(4) - (5)].command), (yyvsp[(5) - (5)].command)); }
  1245. break;
  1246. case 117:
  1247. ! #line 1029 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1248. { (yyvsp[(2) - (2)].pattern)->next = (yyvsp[(1) - (2)].pattern); (yyval.pattern) = (yyvsp[(2) - (2)].pattern); }
  1249. break;
  1250. case 118:
  1251. ! #line 1033 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1252. { (yyval.pattern) = make_pattern_list ((yyvsp[(2) - (4)].word_list), (yyvsp[(4) - (4)].command)); }
  1253. break;
  1254. case 119:
  1255. ! #line 1035 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1256. { (yyval.pattern) = make_pattern_list ((yyvsp[(2) - (4)].word_list), (COMMAND *)NULL); }
  1257. break;
  1258. case 120:
  1259. ! #line 1037 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1260. { (yyval.pattern) = make_pattern_list ((yyvsp[(3) - (5)].word_list), (yyvsp[(5) - (5)].command)); }
  1261. break;
  1262. case 121:
  1263. ! #line 1039 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1264. { (yyval.pattern) = make_pattern_list ((yyvsp[(3) - (5)].word_list), (COMMAND *)NULL); }
  1265. break;
  1266. case 122:
  1267. ! #line 1043 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1268. { (yyval.pattern) = (yyvsp[(1) - (2)].pattern); }
  1269. break;
  1270. case 123:
  1271. ! #line 1045 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1272. { (yyvsp[(2) - (3)].pattern)->next = (yyvsp[(1) - (3)].pattern); (yyval.pattern) = (yyvsp[(2) - (3)].pattern); }
  1273. break;
  1274. case 124:
  1275. ! #line 1047 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1276. { (yyvsp[(1) - (2)].pattern)->flags |= CASEPAT_FALLTHROUGH; (yyval.pattern) = (yyvsp[(1) - (2)].pattern); }
  1277. break;
  1278. case 125:
  1279. ! #line 1049 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1280. { (yyvsp[(2) - (3)].pattern)->flags |= CASEPAT_FALLTHROUGH; (yyvsp[(2) - (3)].pattern)->next = (yyvsp[(1) - (3)].pattern); (yyval.pattern) = (yyvsp[(2) - (3)].pattern); }
  1281. break;
  1282. case 126:
  1283. ! #line 1051 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1284. { (yyvsp[(1) - (2)].pattern)->flags |= CASEPAT_TESTNEXT; (yyval.pattern) = (yyvsp[(1) - (2)].pattern); }
  1285. break;
  1286. case 127:
  1287. ! #line 1053 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1288. { (yyvsp[(2) - (3)].pattern)->flags |= CASEPAT_TESTNEXT; (yyvsp[(2) - (3)].pattern)->next = (yyvsp[(1) - (3)].pattern); (yyval.pattern) = (yyvsp[(2) - (3)].pattern); }
  1289. break;
  1290. case 128:
  1291. ! #line 1057 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1292. { (yyval.word_list) = make_word_list ((yyvsp[(1) - (1)].word), (WORD_LIST *)NULL); }
  1293. break;
  1294. case 129:
  1295. ! #line 1059 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1296. { (yyval.word_list) = make_word_list ((yyvsp[(3) - (3)].word), (yyvsp[(1) - (3)].word_list)); }
  1297. break;
  1298. case 130:
  1299. ! #line 1068 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1300. {
  1301. (yyval.command) = (yyvsp[(2) - (2)].command);
  1302. --- 2996,3110 ----
  1303. case 107:
  1304. ! #line 999 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1305. { (yyval.command) = make_if_command ((yyvsp[(2) - (5)].command), (yyvsp[(4) - (5)].command), (COMMAND *)NULL); }
  1306. break;
  1307. case 108:
  1308. ! #line 1001 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1309. { (yyval.command) = make_if_command ((yyvsp[(2) - (7)].command), (yyvsp[(4) - (7)].command), (yyvsp[(6) - (7)].command)); }
  1310. break;
  1311. case 109:
  1312. ! #line 1003 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1313. { (yyval.command) = make_if_command ((yyvsp[(2) - (6)].command), (yyvsp[(4) - (6)].command), (yyvsp[(5) - (6)].command)); }
  1314. break;
  1315. case 110:
  1316. ! #line 1008 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1317. { (yyval.command) = make_group_command ((yyvsp[(2) - (3)].command)); }
  1318. break;
  1319. case 111:
  1320. ! #line 1012 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1321. { (yyval.command) = make_arith_command ((yyvsp[(1) - (1)].word_list)); }
  1322. break;
  1323. case 112:
  1324. ! #line 1016 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1325. { (yyval.command) = (yyvsp[(2) - (3)].command); }
  1326. break;
  1327. case 113:
  1328. ! #line 1020 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1329. { (yyval.command) = make_if_command ((yyvsp[(2) - (4)].command), (yyvsp[(4) - (4)].command), (COMMAND *)NULL); }
  1330. break;
  1331. case 114:
  1332. ! #line 1022 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1333. { (yyval.command) = make_if_command ((yyvsp[(2) - (6)].command), (yyvsp[(4) - (6)].command), (yyvsp[(6) - (6)].command)); }
  1334. break;
  1335. case 115:
  1336. ! #line 1024 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1337. { (yyval.command) = make_if_command ((yyvsp[(2) - (5)].command), (yyvsp[(4) - (5)].command), (yyvsp[(5) - (5)].command)); }
  1338. break;
  1339. case 117:
  1340. ! #line 1029 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1341. { (yyvsp[(2) - (2)].pattern)->next = (yyvsp[(1) - (2)].pattern); (yyval.pattern) = (yyvsp[(2) - (2)].pattern); }
  1342. break;
  1343. case 118:
  1344. ! #line 1033 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1345. { (yyval.pattern) = make_pattern_list ((yyvsp[(2) - (4)].word_list), (yyvsp[(4) - (4)].command)); }
  1346. break;
  1347. case 119:
  1348. ! #line 1035 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1349. { (yyval.pattern) = make_pattern_list ((yyvsp[(2) - (4)].word_list), (COMMAND *)NULL); }
  1350. break;
  1351. case 120:
  1352. ! #line 1037 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1353. { (yyval.pattern) = make_pattern_list ((yyvsp[(3) - (5)].word_list), (yyvsp[(5) - (5)].command)); }
  1354. break;
  1355. case 121:
  1356. ! #line 1039 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1357. { (yyval.pattern) = make_pattern_list ((yyvsp[(3) - (5)].word_list), (COMMAND *)NULL); }
  1358. break;
  1359. case 122:
  1360. ! #line 1043 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1361. { (yyval.pattern) = (yyvsp[(1) - (2)].pattern); }
  1362. break;
  1363. case 123:
  1364. ! #line 1045 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1365. { (yyvsp[(2) - (3)].pattern)->next = (yyvsp[(1) - (3)].pattern); (yyval.pattern) = (yyvsp[(2) - (3)].pattern); }
  1366. break;
  1367. case 124:
  1368. ! #line 1047 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1369. { (yyvsp[(1) - (2)].pattern)->flags |= CASEPAT_FALLTHROUGH; (yyval.pattern) = (yyvsp[(1) - (2)].pattern); }
  1370. break;
  1371. case 125:
  1372. ! #line 1049 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1373. { (yyvsp[(2) - (3)].pattern)->flags |= CASEPAT_FALLTHROUGH; (yyvsp[(2) - (3)].pattern)->next = (yyvsp[(1) - (3)].pattern); (yyval.pattern) = (yyvsp[(2) - (3)].pattern); }
  1374. break;
  1375. case 126:
  1376. ! #line 1051 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1377. { (yyvsp[(1) - (2)].pattern)->flags |= CASEPAT_TESTNEXT; (yyval.pattern) = (yyvsp[(1) - (2)].pattern); }
  1378. break;
  1379. case 127:
  1380. ! #line 1053 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1381. { (yyvsp[(2) - (3)].pattern)->flags |= CASEPAT_TESTNEXT; (yyvsp[(2) - (3)].pattern)->next = (yyvsp[(1) - (3)].pattern); (yyval.pattern) = (yyvsp[(2) - (3)].pattern); }
  1382. break;
  1383. case 128:
  1384. ! #line 1057 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1385. { (yyval.word_list) = make_word_list ((yyvsp[(1) - (1)].word), (WORD_LIST *)NULL); }
  1386. break;
  1387. case 129:
  1388. ! #line 1059 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1389. { (yyval.word_list) = make_word_list ((yyvsp[(3) - (3)].word), (yyvsp[(1) - (3)].word_list)); }
  1390. break;
  1391. case 130:
  1392. ! #line 1068 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1393. {
  1394. (yyval.command) = (yyvsp[(2) - (2)].command);
  1395. ***************
  1396. *** 3115,3119 ****
  1397. case 132:
  1398. ! #line 1077 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1399. {
  1400. (yyval.command) = (yyvsp[(2) - (2)].command);
  1401. --- 3115,3119 ----
  1402. case 132:
  1403. ! #line 1077 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1404. {
  1405. (yyval.command) = (yyvsp[(2) - (2)].command);
  1406. ***************
  1407. *** 3122,3126 ****
  1408. case 134:
  1409. ! #line 1084 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1410. {
  1411. if ((yyvsp[(1) - (3)].command)->type == cm_connection)
  1412. --- 3122,3126 ----
  1413. case 134:
  1414. ! #line 1084 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1415. {
  1416. if ((yyvsp[(1) - (3)].command)->type == cm_connection)
  1417. ***************
  1418. *** 3132,3146 ****
  1419. case 136:
  1420. ! #line 1095 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1421. { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), AND_AND); }
  1422. break;
  1423. case 137:
  1424. ! #line 1097 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1425. { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), OR_OR); }
  1426. break;
  1427. case 138:
  1428. ! #line 1099 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1429. {
  1430. if ((yyvsp[(1) - (4)].command)->type == cm_connection)
  1431. --- 3132,3146 ----
  1432. case 136:
  1433. ! #line 1095 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1434. { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), AND_AND); }
  1435. break;
  1436. case 137:
  1437. ! #line 1097 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1438. { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), OR_OR); }
  1439. break;
  1440. case 138:
  1441. ! #line 1099 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1442. {
  1443. if ((yyvsp[(1) - (4)].command)->type == cm_connection)
  1444. ***************
  1445. *** 3152,3186 ****
  1446. case 139:
  1447. ! #line 1106 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1448. { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), ';'); }
  1449. break;
  1450. case 140:
  1451. ! #line 1108 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1452. { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), ';'); }
  1453. break;
  1454. case 141:
  1455. ! #line 1110 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1456. { (yyval.command) = (yyvsp[(1) - (1)].command); }
  1457. break;
  1458. case 144:
  1459. ! #line 1118 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1460. { (yyval.number) = '\n'; }
  1461. break;
  1462. case 145:
  1463. ! #line 1120 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1464. { (yyval.number) = ';'; }
  1465. break;
  1466. case 146:
  1467. ! #line 1122 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1468. { (yyval.number) = yacc_EOF; }
  1469. break;
  1470. case 149:
  1471. ! #line 1136 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1472. {
  1473. (yyval.command) = (yyvsp[(1) - (1)].command);
  1474. --- 3152,3186 ----
  1475. case 139:
  1476. ! #line 1106 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1477. { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), ';'); }
  1478. break;
  1479. case 140:
  1480. ! #line 1108 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1481. { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), ';'); }
  1482. break;
  1483. case 141:
  1484. ! #line 1110 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1485. { (yyval.command) = (yyvsp[(1) - (1)].command); }
  1486. break;
  1487. case 144:
  1488. ! #line 1118 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1489. { (yyval.number) = '\n'; }
  1490. break;
  1491. case 145:
  1492. ! #line 1120 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1493. { (yyval.number) = ';'; }
  1494. break;
  1495. case 146:
  1496. ! #line 1122 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1497. { (yyval.number) = yacc_EOF; }
  1498. break;
  1499. case 149:
  1500. ! #line 1136 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1501. {
  1502. (yyval.command) = (yyvsp[(1) - (1)].command);
  1503. ***************
  1504. *** 3198,3202 ****
  1505. case 150:
  1506. ! #line 1149 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1507. {
  1508. if ((yyvsp[(1) - (2)].command)->type == cm_connection)
  1509. --- 3198,3202 ----
  1510. case 150:
  1511. ! #line 1149 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1512. {
  1513. if ((yyvsp[(1) - (2)].command)->type == cm_connection)
  1514. ***************
  1515. *** 3217,3221 ****
  1516. case 151:
  1517. ! #line 1165 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1518. {
  1519. (yyval.command) = (yyvsp[(1) - (2)].command);
  1520. --- 3217,3221 ----
  1521. case 151:
  1522. ! #line 1165 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1523. {
  1524. (yyval.command) = (yyvsp[(1) - (2)].command);
  1525. ***************
  1526. *** 3233,3247 ****
  1527. case 152:
  1528. ! #line 1180 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1529. { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), AND_AND); }
  1530. break;
  1531. case 153:
  1532. ! #line 1182 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1533. { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), OR_OR); }
  1534. break;
  1535. case 154:
  1536. ! #line 1184 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1537. {
  1538. if ((yyvsp[(1) - (3)].command)->type == cm_connection)
  1539. --- 3233,3247 ----
  1540. case 152:
  1541. ! #line 1180 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1542. { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), AND_AND); }
  1543. break;
  1544. case 153:
  1545. ! #line 1182 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1546. { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), OR_OR); }
  1547. break;
  1548. case 154:
  1549. ! #line 1184 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1550. {
  1551. if ((yyvsp[(1) - (3)].command)->type == cm_connection)
  1552. ***************
  1553. *** 3253,3272 ****
  1554. case 155:
  1555. ! #line 1191 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1556. { (yyval.command) = command_connect ((yyvsp[(1) - (3)].command), (yyvsp[(3) - (3)].command), ';'); }
  1557. break;
  1558. case 156:
  1559. ! #line 1194 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1560. { (yyval.command) = (yyvsp[(1) - (1)].command); }
  1561. break;
  1562. case 157:
  1563. ! #line 1198 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1564. { (yyval.command) = (yyvsp[(1) - (1)].command); }
  1565. break;
  1566. case 158:
  1567. ! #line 1200 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1568. {
  1569. if ((yyvsp[(2) - (2)].command))
  1570. --- 3253,3272 ----
  1571. case 155:
  1572. ! #line 1191 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1573. { (yyval.command) = command_connect ((yyvsp[(1) - (3)].command), (yyvsp[(3) - (3)].command), ';'); }
  1574. break;
  1575. case 156:
  1576. ! #line 1194 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1577. { (yyval.command) = (yyvsp[(1) - (1)].command); }
  1578. break;
  1579. case 157:
  1580. ! #line 1198 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1581. { (yyval.command) = (yyvsp[(1) - (1)].command); }
  1582. break;
  1583. case 158:
  1584. ! #line 1200 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1585. {
  1586. if ((yyvsp[(2) - (2)].command))
  1587. ***************
  1588. *** 3277,3281 ****
  1589. case 159:
  1590. ! #line 1206 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1591. {
  1592. if ((yyvsp[(2) - (2)].command))
  1593. --- 3277,3281 ----
  1594. case 159:
  1595. ! #line 1206 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1596. {
  1597. if ((yyvsp[(2) - (2)].command))
  1598. ***************
  1599. *** 3286,3290 ****
  1600. case 160:
  1601. ! #line 1212 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1602. {
  1603. ELEMENT x;
  1604. --- 3286,3290 ----
  1605. case 160:
  1606. ! #line 1212 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1607. {
  1608. ELEMENT x;
  1609. ***************
  1610. *** 3306,3310 ****
  1611. case 161:
  1612. ! #line 1229 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1613. {
  1614. ELEMENT x;
  1615. --- 3306,3310 ----
  1616. case 161:
  1617. ! #line 1229 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1618. {
  1619. ELEMENT x;
  1620. ***************
  1621. *** 3327,3336 ****
  1622. case 162:
  1623. ! #line 1249 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1624. { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), '|'); }
  1625. break;
  1626. case 163:
  1627. ! #line 1251 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1628. {
  1629. /* Make cmd1 |& cmd2 equivalent to cmd1 2>&1 | cmd2 */
  1630. --- 3327,3336 ----
  1631. case 162:
  1632. ! #line 1249 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1633. { (yyval.command) = command_connect ((yyvsp[(1) - (4)].command), (yyvsp[(4) - (4)].command), '|'); }
  1634. break;
  1635. case 163:
  1636. ! #line 1251 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1637. {
  1638. /* Make cmd1 |& cmd2 equivalent to cmd1 2>&1 | cmd2 */
  1639. ***************
  1640. *** 3358,3377 ****
  1641. case 164:
  1642. ! #line 1274 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1643. { (yyval.command) = (yyvsp[(1) - (1)].command); }
  1644. break;
  1645. case 165:
  1646. ! #line 1278 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1647. { (yyval.number) = CMD_TIME_PIPELINE; }
  1648. break;
  1649. case 166:
  1650. ! #line 1280 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1651. { (yyval.number) = CMD_TIME_PIPELINE|CMD_TIME_POSIX; }
  1652. break;
  1653. case 167:
  1654. ! #line 1282 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1655. { (yyval.number) = CMD_TIME_PIPELINE|CMD_TIME_POSIX; }
  1656. break;
  1657. --- 3358,3377 ----
  1658. case 164:
  1659. ! #line 1274 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1660. { (yyval.command) = (yyvsp[(1) - (1)].command); }
  1661. break;
  1662. case 165:
  1663. ! #line 1278 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1664. { (yyval.number) = CMD_TIME_PIPELINE; }
  1665. break;
  1666. case 166:
  1667. ! #line 1280 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1668. { (yyval.number) = CMD_TIME_PIPELINE|CMD_TIME_POSIX; }
  1669. break;
  1670. case 167:
  1671. ! #line 1282 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1672. { (yyval.number) = CMD_TIME_PIPELINE|CMD_TIME_POSIX; }
  1673. break;
  1674. ***************
  1675. *** 3593,3597 ****
  1676. ! #line 1284 "/usr/src/local/chet/src/bash/bash-4.3.28/parse.y"
  1677. --- 3593,3597 ----
  1678. ! #line 1284 "/usr/src/local/bash/bash-4.3-patched/parse.y"
  1679. ***************
  1680. *** 4851,4854 ****
  1681. --- 4851,4864 ----
  1682. }
  1683. + char *
  1684. + parser_remaining_input ()
  1685. + {
  1686. + if (shell_input_line == 0)
  1687. + return 0;
  1688. + if (shell_input_line_index < 0 || shell_input_line_index >= shell_input_line_len)
  1689. + return '\0'; /* XXX */
  1690. + return (shell_input_line + shell_input_line_index);
  1691. + }
  1692. +
  1693. #ifdef INCLUDE_UNUSED
  1694. /* Back the input pointer up by one, effectively `ungetting' a character. */
  1695. ***************
  1696. *** 6340,6345 ****
  1697. /* reset_parser clears shell_input_line and associated variables */
  1698. restore_input_line_state (&ls);
  1699. ! if (interactive)
  1700. ! token_to_read = 0;
  1701. /* Need to find how many characters parse_and_execute consumed, update
  1702. --- 6350,6355 ----
  1703. /* reset_parser clears shell_input_line and associated variables */
  1704. restore_input_line_state (&ls);
  1705. !
  1706. ! token_to_read = 0;
  1707. /* Need to find how many characters parse_and_execute consumed, update
  1708. *** a/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
  1709. --- b/patchlevel.h 2014-03-20 20:01:28.000000000 -0400
  1710. ***************
  1711. *** 26,30 ****
  1712. looks for to find the patch level (for the sccs version string). */
  1713. ! #define PATCHLEVEL 29
  1714. #endif /* _PATCHLEVEL_H_ */
  1715. --- 26,30 ----
  1716. looks for to find the patch level (for the sccs version string). */
  1717. ! #define PATCHLEVEL 30
  1718. #endif /* _PATCHLEVEL_H_ */