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

libbb: exec_login_shell() - new function

Browse Source 
function                                             old     new   delta
exec_login_shell                                       -      12     +12
sulogin_main                                         247     240      -7
login_main                                           960     953      -7
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 0/2 up/down: 12/-14)             Total: -2 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2020-12-02 21:51:08 +01:00
parent 0622416fec
commit f4f6e5144b
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/libbb.h
View File

@ -1607,6 +1607,7 @@ void msleep(unsigned ms) FAST_FUNC;
void sleep1(void) FAST_FUNC; void sleep1(void) FAST_FUNC;
void change_identity(const struct passwd *pw) FAST_FUNC; void change_identity(const struct passwd *pw) FAST_FUNC;
void exec_shell(const char *shell, int loginshell, const char **args) NORETURN FAST_FUNC; void exec_shell(const char *shell, int loginshell, const char **args) NORETURN FAST_FUNC;
void exec_login_shell(const char *shell) NORETURN FAST_FUNC;
void exec_prog_or_SHELL(char **argv) NORETURN FAST_FUNC; void exec_prog_or_SHELL(char **argv) NORETURN FAST_FUNC;
/* Returns $SHELL, getpwuid(getuid())->pw_shell, or DEFAULT_SHELL. /* Returns $SHELL, getpwuid(getuid())->pw_shell, or DEFAULT_SHELL.

9
libbb/run_shell.c
View File

@ -84,14 +84,19 @@ void FAST_FUNC exec_shell(const char *shell, int loginshell, const char **additi
bb_perror_msg_and_die("can't execute '%s'", shell); bb_perror_msg_and_die("can't execute '%s'", shell);
} }
void FAST_FUNC exec_login_shell(const char *shell)
{
exec_shell(shell, 1, NULL);
}
/* Typical idiom for applets which exec *optional* PROG [ARGS] */ /* Typical idiom for applets which exec *optional* PROG [ARGS] */
void FAST_FUNC exec_prog_or_SHELL(char **argv) void FAST_FUNC exec_prog_or_SHELL(char **argv)
{ {
if (argv[0]) { if (argv[0]) {
BB_EXECVP_or_die(argv); BB_EXECVP_or_die(argv);
} }
/* Why login=1? Both users (nsenter and unshare) do indeed exec /* Both users (nsenter and unshare) do indeed exec
* a _login_ shell (with dash in argv[0])! * a _login_ shell (with dash in argv[0])!
*/ */
exec_shell(getenv("SHELL"), /*login:*/ 1, NULL); exec_login_shell(getenv("SHELL"));
} }

2
loginutils/login.c
View File

@ -602,7 +602,7 @@ int login_main(int argc UNUSED_PARAM, char **argv)
signal(SIGINT, SIG_DFL); signal(SIGINT, SIG_DFL);
/* Exec login shell with no additional parameters */ /* Exec login shell with no additional parameters */
exec_shell(pw->pw_shell, 1, NULL); exec_login_shell(pw->pw_shell);
/* return EXIT_FAILURE; - not reached */ /* return EXIT_FAILURE; - not reached */
} }

2
loginutils/sulogin.c
View File

@ -89,5 +89,5 @@ int sulogin_main(int argc UNUSED_PARAM, char **argv)
shell = pwd->pw_shell; shell = pwd->pw_shell;
/* Exec login shell with no additional parameters. Never returns. */ /* Exec login shell with no additional parameters. Never returns. */
exec_shell(shell, 1, NULL); exec_login_shell(shell);
} }