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

crontab: use setup_environment

Browse Source 
function                                             old     new   delta
setup_environment                                    184     198     +14
.rodata                                           131770  131747     -23
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/1 up/down: 14/-23)             Total: -9 bytes

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
This commit is contained in:
Bernhard Reutner-Fischer 2010-02-24 16:10:09 +01:00 committed by Denys Vlasenko
parent 7e7728cd66
commit 99709ab033
4 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/libbb.h
View File

@ -1142,6 +1142,7 @@ extern void selinux_or_die(void) FAST_FUNC;
extern int restricted_shell(const char *shell) FAST_FUNC; extern int restricted_shell(const char *shell) FAST_FUNC;
/* setup_environment: /* setup_environment:
* if chdir pw->pw_dir: ok: else if to_tmp == 1: goto /tmp else: goto / or die
* if clear_env = 1: cd(pw->pw_dir), clear environment, then set * if clear_env = 1: cd(pw->pw_dir), clear environment, then set
* TERM=(old value) * TERM=(old value)
* USER=pw->pw_name, LOGNAME=pw->pw_name * USER=pw->pw_name, LOGNAME=pw->pw_name
@ -1155,7 +1156,9 @@ extern int restricted_shell(const char *shell) FAST_FUNC;
* SHELL=shell * SHELL=shell
* else does nothing * else does nothing
*/ */
extern void setup_environment(const char *shell, int clear_env, int change_env, const struct passwd *pw) FAST_FUNC; #define SETUP_ENV_CHANGEENV (1<<0)
#define SETUP_ENV_TO_TMP (1<<1)
extern void setup_environment(const char *shell, int clear_env, int flags, const struct passwd *pw) FAST_FUNC;
extern int correct_password(const struct passwd *pw) FAST_FUNC; extern int correct_password(const struct passwd *pw) FAST_FUNC;
/* Returns a malloced string */ /* Returns a malloced string */
#if !ENABLE_USE_BB_CRYPT #if !ENABLE_USE_BB_CRYPT

7
libbb/setup_environment.c
View File

@ -30,12 +30,12 @@
#include "libbb.h" #include "libbb.h"
void FAST_FUNC setup_environment(const char *shell, int clear_env, int change_env, const struct passwd *pw) void FAST_FUNC setup_environment(const char *shell, int clear_env, int flags, const struct passwd *pw)
{ {
/* Change the current working directory to be the home directory /* Change the current working directory to be the home directory
* of the user */ * of the user */
if (chdir(pw->pw_dir)) { if (chdir(pw->pw_dir)) {
xchdir("/"); xchdir((flags & SETUP_ENV_TO_TMP) ? "/tmp" : "/");
bb_error_msg("can't chdir to home directory '%s'", pw->pw_dir); bb_error_msg("can't chdir to home directory '%s'", pw->pw_dir);
} }
@ -55,8 +55,7 @@ void FAST_FUNC setup_environment(const char *shell, int clear_env, int change_en
//xsetenv("LOGNAME", pw->pw_name); //xsetenv("LOGNAME", pw->pw_name);
//xsetenv("HOME", pw->pw_dir); //xsetenv("HOME", pw->pw_dir);
//xsetenv("SHELL", shell); //xsetenv("SHELL", shell);
} } else if (flags & SETUP_ENV_CHANGEENV) {
else if (change_env) {
/* Set HOME, SHELL, and if not becoming a super-user, /* Set HOME, SHELL, and if not becoming a super-user,
USER and LOGNAME. */ USER and LOGNAME. */
if (pw->pw_uid) { if (pw->pw_uid) {

2
loginutils/login.c
View File

@ -478,7 +478,7 @@ int login_main(int argc UNUSED_PARAM, char **argv)
if (!tmp || !*tmp) if (!tmp || !*tmp)
tmp = DEFAULT_SHELL; tmp = DEFAULT_SHELL;
/* setup_environment params: shell, clear_env, change_env, pw */ /* setup_environment params: shell, clear_env, change_env, pw */
setup_environment(tmp, !(opt & LOGIN_OPT_p), 1, pw); setup_environment(tmp, !(opt & LOGIN_OPT_p), SETUP_ENV_CHANGEENV, pw);
motd(); motd();

21
miscutils/crontab.c
View File

@ -17,22 +17,6 @@
#define CRONUPDATE "cron.update" #define CRONUPDATE "cron.update"
#endif #endif
static void change_user(const struct passwd *pas)
{
xsetenv("USER", pas->pw_name);
xsetenv("HOME", pas->pw_dir);
xsetenv("SHELL", DEFAULT_SHELL);
/* initgroups, setgid, setuid */
change_identity(pas);
if (chdir(pas->pw_dir) < 0) {
bb_perror_msg("chdir(%s) by %s failed",
pas->pw_dir, pas->pw_name);
xchdir("/tmp");
}
}
static void edit_file(const struct passwd *pas, const char *file) static void edit_file(const struct passwd *pas, const char *file)
{ {
const char *ptr; const char *ptr;
@ -46,7 +30,10 @@ static void edit_file(const struct passwd *pas, const char *file)
} }
/* CHILD - change user and run editor */ /* CHILD - change user and run editor */
change_user(pas); /* initgroups, setgid, setuid */
change_identity(pas);
setup_environment(DEFAULT_SHELL, 0,
SETUP_ENV_CHANGEENV | SETUP_ENV_TO_TMP, pas);
ptr = getenv("VISUAL"); ptr = getenv("VISUAL");
if (!ptr) { if (!ptr) {
ptr = getenv("EDITOR"); ptr = getenv("EDITOR");