diff options
| author | Denys Vlasenko | 2017-07-03 21:31:16 +0200 |
|---|---|---|
| committer | Denys Vlasenko | 2017-07-03 21:31:16 +0200 |
| commit | d4e4fdb5ce5ccc067b3d35d877f7a7d978869517 (patch) | |
| tree | bac3e4a55fa72db0c67d377b90869b4d63e8c3c9 /shell | |
| parent | 2e989ef232e35750df573898077dd356003705b2 (diff) | |
| download | busybox-d4e4fdb5ce5ccc067b3d35d877f7a7d978869517.zip busybox-d4e4fdb5ce5ccc067b3d35d877f7a7d978869517.tar.gz | |
fixes for bugs found by make_single_applets.sh
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/hush.c | 26 | ||||
| -rw-r--r-- | shell/shell_common.c | 4 |
2 files changed, 7 insertions, 23 deletions
diff --git a/shell/hush.c b/shell/hush.c index fc6db31..30add72 100644 --- a/shell/hush.c +++ b/shell/hush.c @@ -1478,8 +1478,6 @@ typedef struct save_arg_t { static void save_and_replace_G_args(save_arg_t *sv, char **argv) { - int n; - sv->sv_argv0 = argv[0]; sv->sv_g_argv = G.global_argv; sv->sv_g_argc = G.global_argc; @@ -1489,10 +1487,7 @@ static void save_and_replace_G_args(save_arg_t *sv, char **argv) G.global_argv = argv; IF_HUSH_SET(G.global_args_malloced = 0;) - n = 1; - while (*++argv) - n++; - G.global_argc = n; + G.global_argc = 1 + string_array_len(argv + 1); } static void restore_G_args(save_arg_t *sv, char **argv) @@ -6809,13 +6804,11 @@ static void exec_function(char ***to_free, char **argv) { # if BB_MMU - int n = 1; + int n; argv[0] = G.global_argv[0]; G.global_argv = argv; - while (*++argv) - n++; - G.global_argc = n; + G.global_argc = n = 1 + string_array_len(argv + 1); /* On MMU, funcp->body is always non-NULL */ n = run_list(funcp->body); fflush_all(); @@ -8811,12 +8804,8 @@ static int FAST_FUNC builtin_true(char **argv UNUSED_PARAM) #if ENABLE_HUSH_TEST || ENABLE_HUSH_ECHO || ENABLE_HUSH_PRINTF || ENABLE_HUSH_KILL static int run_applet_main(char **argv, int (*applet_main_func)(int argc, char **argv)) { - int argc = 0; - while (*argv) { - argc++; - argv++; - } - return applet_main_func(argc, argv - argc); + int argc = string_array_len(argv); + return applet_main_func(argc, argv); } #endif #if ENABLE_HUSH_TEST || BASH_TEST2 @@ -9363,10 +9352,7 @@ static int FAST_FUNC builtin_set(char **argv) /* This realloc's G.global_argv */ G.global_argv = pp = add_strings_to_strings(g_argv, argv, /*dup:*/ 1); - n = 1; - while (*++pp) - n++; - G.global_argc = n; + G.global_argc = 1 + string_array_len(pp + 1); return EXIT_SUCCESS; diff --git a/shell/shell_common.c b/shell/shell_common.c index 03b7d0b..bf56f3d 100644 --- a/shell/shell_common.c +++ b/shell/shell_common.c @@ -405,9 +405,7 @@ shell_builtin_ulimit(char **argv) */ GETOPT_RESET(); - argc = 1; - while (argv[argc]) - argc++; + argc = string_array_len(argv); opts = 0; while (1) { |