emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

main: fix the case where user has "halt" as login shell. Closes 9986

Browse Source 
halt::0:0::/:/sbin/halt

function                                             old     new   delta
run_applet_and_exit                                  748     751      +3
run_applet_no_and_exit                               467     459      -8

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2017-07-07 19:08:56 +02:00
parent b0c0b6d5ba
commit 69a5ec9dcc
5 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/libbb.h
View File

@ -1117,7 +1117,7 @@ int spawn_and_wait(char **argv) FAST_FUNC;
int run_nofork_applet(int applet_no, char **argv) FAST_FUNC; int run_nofork_applet(int applet_no, char **argv) FAST_FUNC;
#ifndef BUILD_INDIVIDUAL #ifndef BUILD_INDIVIDUAL
extern int find_applet_by_name(const char *name) FAST_FUNC; 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 #endif
/* Helpers for daemonization. /* Helpers for daemonization.

10
libbb/appletlib.c
View File

@ -877,13 +877,17 @@ static int busybox_main(char **argv)
# endif # endif
# if NUM_APPLETS > 0 # 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); int argc = string_array_len(argv);
/* Reinit some shared global data */ /* Reinit some shared global data */
xfunc_error_retval = EXIT_FAILURE; 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" /* Special case. POSIX says "test --help"
* should be no different from e.g. "test --foo". * 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); int applet = find_applet_by_name(name);
if (applet >= 0) if (applet >= 0)
run_applet_no_and_exit(applet, argv); run_applet_no_and_exit(applet, name, argv);
} }
# endif # endif

2
libbb/vfork_daemon_rexec.c
View File

@ -180,7 +180,7 @@ int FAST_FUNC spawn_and_wait(char **argv)
* as of yet (and that should probably always stay true). * as of yet (and that should probably always stay true).
*/ */
/* xfunc_error_retval and applet_name are init by: */ /* 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 # endif
} }

2
shell/ash.c
View File

@ -7717,7 +7717,7 @@ tryexec(IF_FEATURE_SH_STANDALONE(int applet_no,) char *cmd, char **argv, char **
clearenv(); clearenv();
while (*envp) while (*envp)
putenv(*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 */ /* re-exec ourselves with the new arguments */
execve(bb_busybox_exec_path, argv, envp); execve(bb_busybox_exec_path, argv, envp);

2
shell/hush.c
View File

@ -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 */ /* Do not leak open fds from opened script files etc */
close_all_FILE_list(); close_all_FILE_list();
debug_printf_exec("running applet '%s'\n", argv[0]); 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 # endif
/* Re-exec ourselves */ /* Re-exec ourselves */