69a5ec9dc
Denys Vlasenko
2017-07-07
Subject
main: fix the case where user has "halt" as login shell. Closes 9986
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
include/libbb.h +1 -1libbb/appletlib.c +7 -3libbb/vfork_daemon_rexec.c +1 -1shell/ash.c +1 -1shell/hush.c +1 -1
include/libbb.h+1 -1
| @@ -1117,7 +1117,7 @@ int spawn_and_wait(char **argv) FAST_FUNC; | |
| int run_nofork_applet(int applet_no, char **argv) FAST_FUNC; | |
| #ifndef BUILD_INDIVIDUAL | |
| extern int find_applet_by_name(const char *name) FAST_FUNC; | |
| - | extern void run_applet_no_and_exit(int a, char **argv) NORETURN FAST_FUNC; |
| + | extern void run_applet_no_and_exit(int a, const char *name, char **argv) NORETURN FAST_FUNC; |
| #endif | |
| /* Helpers for daemonization. | |
libbb/appletlib.c+7 -3
| @@ -877,13 +877,17 @@ static int busybox_main(char **argv) | |
| # endif | |
| # if NUM_APPLETS > 0 | |
| - | void FAST_FUNC run_applet_no_and_exit(int applet_no, char **argv) |
| + | void FAST_FUNC run_applet_no_and_exit(int applet_no, const char *name, char **argv) |
| { | |
| int argc = string_array_len(argv); | |
| /* Reinit some shared global data */ | |
| xfunc_error_retval = EXIT_FAILURE; | |
| - | applet_name = bb_get_last_path_component_nostrip(argv[0]); |
| + | /* |
| + | * We do not use argv[0]: do not want to repeat massaging of |
| + | * "-/sbin/halt" -> "halt", for example. |
| + | */ |
| + | applet_name = name; |
| /* Special case. POSIX says "test --help" | |
| * should be no different from e.g. "test --foo". | |
| @@ -927,7 +931,7 @@ static NORETURN void run_applet_and_exit(const char *name, char **argv) | |
| { | |
| int applet = find_applet_by_name(name); | |
| if (applet >= 0) | |
| - | run_applet_no_and_exit(applet, argv); |
| + | run_applet_no_and_exit(applet, name, argv); |
| } | |
| # endif | |
libbb/vfork_daemon_rexec.c+1 -1
| @@ -180,7 +180,7 @@ int FAST_FUNC spawn_and_wait(char **argv) | |
| * as of yet (and that should probably always stay true). | |
| */ | |
| /* xfunc_error_retval and applet_name are init by: */ | |
| - | run_applet_no_and_exit(a, argv); |
| + | run_applet_no_and_exit(a, argv[0], argv); |
| } | |
| # endif | |
| } | |
shell/ash.c+1 -1
| @@ -7717,7 +7717,7 @@ tryexec(IF_FEATURE_SH_STANDALONE(int applet_no,) char *cmd, char **argv, char ** | |
| clearenv(); | |
| while (*envp) | |
| putenv(*envp++); | |
| - | run_applet_no_and_exit(applet_no, argv); |
| + | run_applet_no_and_exit(applet_no, cmd, argv); |
| } | |
| /* re-exec ourselves with the new arguments */ | |
| execve(bb_busybox_exec_path, argv, envp); | |
shell/hush.c+1 -1
| @@ -7063,7 +7063,7 @@ static NOINLINE void pseudo_exec_argv(nommu_save_t *nommu_save, | |
| /* Do not leak open fds from opened script files etc */ | |
| close_all_FILE_list(); | |
| debug_printf_exec("running applet '%s'\n", argv[0]); | |
| - | run_applet_no_and_exit(a, argv); |
| + | run_applet_no_and_exit(a, argv[0], argv); |
| } | |
| # endif | |
| /* Re-exec ourselves */ | |