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

libbb: rename run_shell() to exec_shell()

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2020-12-02 21:28:47 +01:00
parent b4f93f562d
commit 2075aa93e0
6 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libbb/executable.c
View File

@@ -91,12 +91,3 @@ void FAST_FUNC BB_EXECVP_or_die(char **argv)
xfunc_error_retval = (errno == ENOENT) ? 127 : 126;
bb_perror_msg_and_die("can't execute '%s'", argv[0]);
}
/* Typical idiom for applets which exec *optional* PROG [ARGS] */
void FAST_FUNC exec_prog_or_SHELL(char **argv)
{
if (argv[0]) {
BB_EXECVP_or_die(argv);
}
run_shell(getenv("SHELL"), /*login:*/ 1, NULL);
}

13
libbb/run_shell.c
View File

@@ -48,10 +48,10 @@ void FAST_FUNC set_current_security_context(security_context_t sid)
#endif
/* Run SHELL, or DEFAULT_SHELL if SHELL is "" or NULL.
/* Exec SHELL, or DEFAULT_SHELL if SHELL is "" or NULL.
* If ADDITIONAL_ARGS is not NULL, pass them to the shell.
*/
void FAST_FUNC run_shell(const char *shell, int loginshell, const char **additional_args)
void FAST_FUNC exec_shell(const char *shell, int loginshell, const char **additional_args)
{
const char **args;
@@ -84,3 +84,12 @@ void FAST_FUNC run_shell(const char *shell, int loginshell, const char **additio
execv(shell, (char **) args);
bb_perror_msg_and_die("can't execute '%s'", shell);
}
/* Typical idiom for applets which exec *optional* PROG [ARGS] */
void FAST_FUNC exec_prog_or_SHELL(char **argv)
{
if (argv[0]) {
BB_EXECVP_or_die(argv);
}
exec_shell(getenv("SHELL"), /*login:*/ 1, NULL);
}