Commit 76009ba
committed
fix(interpreter): propagate errexit_suppressed through compound commands
When a loop body's last command is an AND-OR list (e.g. `[[ cond ]] && cmd`)
that exits non-zero, the loop should not trigger `set -e` at the caller level.
Add `errexit_suppressed` flag to ExecResult. Set it when execute_list returns
a non-zero exit from an AND-OR chain. Propagate it through for, while/until,
and C-style for loops back to execute_command_sequence_impl, which now skips
errexit when the flag is set.
Closes #8671 parent c246ad3 commit 76009ba
File tree
3 files changed
+124
-1
lines changed- crates/bashkit
- src/interpreter
- tests
3 files changed
+124
-1
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1457 | 1457 | | |
1458 | 1458 | | |
1459 | 1459 | | |
| 1460 | + | |
1460 | 1461 | | |
1461 | 1462 | | |
1462 | 1463 | | |
| |||
1512 | 1513 | | |
1513 | 1514 | | |
1514 | 1515 | | |
| 1516 | + | |
1515 | 1517 | | |
1516 | 1518 | | |
1517 | 1519 | | |
| |||
1564 | 1566 | | |
1565 | 1567 | | |
1566 | 1568 | | |
| 1569 | + | |
1567 | 1570 | | |
1568 | 1571 | | |
1569 | 1572 | | |
| |||
1748 | 1751 | | |
1749 | 1752 | | |
1750 | 1753 | | |
| 1754 | + | |
1751 | 1755 | | |
1752 | 1756 | | |
1753 | 1757 | | |
| |||
1776 | 1780 | | |
1777 | 1781 | | |
1778 | 1782 | | |
| 1783 | + | |
1779 | 1784 | | |
1780 | 1785 | | |
1781 | 1786 | | |
| |||
1829 | 1834 | | |
1830 | 1835 | | |
1831 | 1836 | | |
| 1837 | + | |
1832 | 1838 | | |
1833 | 1839 | | |
1834 | 1840 | | |
| |||
2180 | 2186 | | |
2181 | 2187 | | |
2182 | 2188 | | |
| 2189 | + | |
2183 | 2190 | | |
2184 | 2191 | | |
2185 | 2192 | | |
| |||
2215 | 2222 | | |
2216 | 2223 | | |
2217 | 2224 | | |
| 2225 | + | |
2218 | 2226 | | |
2219 | 2227 | | |
2220 | 2228 | | |
| |||
2264 | 2272 | | |
2265 | 2273 | | |
2266 | 2274 | | |
| 2275 | + | |
2267 | 2276 | | |
2268 | 2277 | | |
2269 | 2278 | | |
| |||
2782 | 2791 | | |
2783 | 2792 | | |
2784 | 2793 | | |
| 2794 | + | |
2785 | 2795 | | |
2786 | 2796 | | |
2787 | 2797 | | |
| |||
2807 | 2817 | | |
2808 | 2818 | | |
2809 | 2819 | | |
| 2820 | + | |
| 2821 | + | |
| 2822 | + | |
2810 | 2823 | | |
2811 | 2824 | | |
2812 | 2825 | | |
2813 | 2826 | | |
2814 | | - | |
| 2827 | + | |
| 2828 | + | |
2815 | 2829 | | |
2816 | 2830 | | |
2817 | 2831 | | |
| |||
2820 | 2834 | | |
2821 | 2835 | | |
2822 | 2836 | | |
| 2837 | + | |
2823 | 2838 | | |
2824 | 2839 | | |
2825 | 2840 | | |
2826 | 2841 | | |
2827 | 2842 | | |
2828 | 2843 | | |
2829 | 2844 | | |
| 2845 | + | |
2830 | 2846 | | |
2831 | 2847 | | |
2832 | 2848 | | |
| |||
3099 | 3115 | | |
3100 | 3116 | | |
3101 | 3117 | | |
| 3118 | + | |
3102 | 3119 | | |
3103 | 3120 | | |
3104 | 3121 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
66 | 66 | | |
67 | 67 | | |
68 | 68 | | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
69 | 73 | | |
70 | 74 | | |
71 | 75 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
89 | 89 | | |
90 | 90 | | |
91 | 91 | | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
92 | 194 | | |
93 | 195 | | |
94 | 196 | | |
| |||
0 commit comments