diff options
| author | Denys Vlasenko | 2017-07-03 21:31:16 +0200 |
|---|---|---|
| committer | Denys Vlasenko | 2017-07-18 19:20:58 +0200 |
| commit | 442d522f0bc6f29c14a3e54a0af3aac68bb891a1 (patch) | |
| tree | aa36853bf59cf4b3d4808d391ab31a714c3fc28c /libbb/appletlib.c | |
| parent | ceaffde51163394c47fec34dac8663ae8152a699 (diff) | |
| download | busybox-442d522f0bc6f29c14a3e54a0af3aac68bb891a1.zip busybox-442d522f0bc6f29c14a3e54a0af3aac68bb891a1.tar.gz | |
fixes for bugs found by make_single_applets.sh
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'libbb/appletlib.c')
| -rw-r--r-- | libbb/appletlib.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/libbb/appletlib.c b/libbb/appletlib.c index 7f0d620..2dea2b4 100644 --- a/libbb/appletlib.c +++ b/libbb/appletlib.c @@ -78,6 +78,17 @@ #endif +unsigned FAST_FUNC string_array_len(char **argv) +{ + char **start = argv; + + while (*argv) + argv++; + + return argv - start; +} + + #if ENABLE_SHOW_USAGE && !ENABLE_FEATURE_COMPRESS_USAGE static const char usage_messages[] ALIGN1 = UNPACKED_USAGE; #else @@ -868,10 +879,7 @@ static int busybox_main(char **argv) # if NUM_APPLETS > 0 void FAST_FUNC run_applet_no_and_exit(int applet_no, char **argv) { - int argc = 1; - - while (argv[argc]) - argc++; + int argc = string_array_len(argv); /* Reinit some shared global data */ xfunc_error_retval = EXIT_FAILURE; @@ -993,7 +1001,11 @@ int main(int argc UNUSED_PARAM, char **argv) } /* applet_names in this case is just "applet\0\0" */ lbb_prepare(applet_names IF_FEATURE_INDIVIDUAL(, argv)); +# if ENABLE_BUILD_LIBBUSYBOX + return SINGLE_APPLET_MAIN(string_array_len(argv), argv); +# else return SINGLE_APPLET_MAIN(argc, argv); +# endif #elif !ENABLE_BUSYBOX && NUM_APPLETS == 0 |