16a0c74f6
Denis Vlasenko
2009-04-05
Subject
hush: fix hush-misc/break5.tests NOMMU failure
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
shell/hush.c+7 -3
| @@ -2345,8 +2345,8 @@ static void re_execute_shell(const char *s) | |
| char **argv, **pp; | |
| unsigned cnt; | |
| - | /* hush -$<pid> -?<exitcode> ... -c <cmd> NULL */ |
| - | cnt = 6; |
| + | /* hush -$<pid> -?<exitcode> -D<depth> ... -c <cmd> NULL */ |
| + | cnt = 7; |
| for (cur = G.top_var; cur; cur = cur->next) { | |
| if (!cur->flg_export || cur->flg_read_only) | |
| cnt += 2; | |
| @@ -2356,6 +2356,7 @@ static void re_execute_shell(const char *s) | |
| *pp++ = (char *) applet_name; | |
| *pp++ = xasprintf("-$%u", G.root_pid); | |
| *pp++ = xasprintf("-?%u", G.last_return_code); | |
| + | *pp++ = xasprintf("-D%u", G.depth_of_loop); |
| for (cur = G.top_var; cur; cur = cur->next) { | |
| if (cur->varstr == hush_version_str) | |
| continue; | |
| @@ -5009,7 +5010,7 @@ int hush_main(int argc, char **argv) | |
| while (1) { | |
| opt = getopt(argc, argv, "c:xins" | |
| #if !BB_MMU | |
| - | "$:?:R:V:" |
| + | "$:?:D:R:V:" |
| #endif | |
| ); | |
| if (opt <= 0) | |
| @@ -5041,6 +5042,9 @@ int hush_main(int argc, char **argv) | |
| case '?': | |
| G.last_return_code = xatoi_u(optarg); | |
| break; | |
| + | case 'D': |
| + | G.depth_of_loop = xatoi_u(optarg); |
| + | break; |
| case 'R': | |
| case 'V': | |
| set_local_var(xstrdup(optarg), 0, opt == 'R'); | |