diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2018-04-09 17:54:07 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2018-04-09 17:54:07 +0200 |
| commit | eb0de05d682b28fcf7465358ea31cf8574c1221b (patch) | |
| tree | f78bf8220b349b39c2cc8b06403fbf40eb2757b9 /shell/hush.c | |
| parent | a1870f4807a75663a085c9f5e92870fa7554f0ad (diff) | |
| download | busybox-w32-eb0de05d682b28fcf7465358ea31cf8574c1221b.tar.gz busybox-w32-eb0de05d682b28fcf7465358ea31cf8574c1221b.tar.bz2 busybox-w32-eb0de05d682b28fcf7465358ea31cf8574c1221b.zip | |
hush: fix func_return2.tests on NOMMU
function old new delta
hush_main 1714 1718 +4
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to '')
| -rw-r--r-- | shell/hush.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/shell/hush.c b/shell/hush.c index d5ea3b21f..3a4b5d894 100644 --- a/shell/hush.c +++ b/shell/hush.c | |||
| @@ -9394,6 +9394,13 @@ int hush_main(int argc, char **argv) | |||
| 9394 | optarg++; | 9394 | optarg++; |
| 9395 | G.depth_of_loop = bb_strtou(optarg, &optarg, 16); | 9395 | G.depth_of_loop = bb_strtou(optarg, &optarg, 16); |
| 9396 | # endif | 9396 | # endif |
| 9397 | # if ENABLE_HUSH_FUNCTIONS | ||
| 9398 | /* nommu uses re-exec trick for "... | func | ...", | ||
| 9399 | * should allow "return". | ||
| 9400 | * This accidentally allows returns in subshells. | ||
| 9401 | */ | ||
| 9402 | G_flag_return_in_progress = -1; | ||
| 9403 | # endif | ||
| 9397 | break; | 9404 | break; |
| 9398 | } | 9405 | } |
| 9399 | case 'R': | 9406 | case 'R': |