aboutsummaryrefslogtreecommitdiff
path: root/libbb/setup_environment.c
diff options
context:
space:
mode:
authorLadislav Michl <Ladislav.Michl@seznam.cz>2010-06-27 03:23:31 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2010-06-27 03:23:31 +0200
commita73b87e9343df2a6f14e328a977e7b70eb3ed707 (patch)
tree564869bde93c870b20f6d4d8a3da71e42b629f2e /libbb/setup_environment.c
parent1b14cdb27ca5e8104a824424731be430c8592dd6 (diff)
downloadbusybox-w32-a73b87e9343df2a6f14e328a977e7b70eb3ed707.tar.gz
busybox-w32-a73b87e9343df2a6f14e328a977e7b70eb3ed707.tar.bz2
busybox-w32-a73b87e9343df2a6f14e328a977e7b70eb3ed707.zip
*: s/"/bin/sh"/DEFAULT_SHELL, run_shell() API fix, remove unneeded strdup
function old new delta run_shell 157 166 +9 su_main 477 470 -7 sulogin_main 515 503 -12 Signed-off-by: Ladislav Michl <Ladislav.Michl@seznam.cz> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'libbb/setup_environment.c')
-rw-r--r--libbb/setup_environment.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libbb/setup_environment.c b/libbb/setup_environment.c
index 13e60d8e4..a95fbc5bf 100644
--- a/libbb/setup_environment.c
+++ b/libbb/setup_environment.c
@@ -43,7 +43,7 @@ void FAST_FUNC setup_environment(const char *shell, int flags, const struct pass
43 const char *term; 43 const char *term;
44 44
45 /* Leave TERM unchanged. Set HOME, SHELL, USER, LOGNAME, PATH. 45 /* Leave TERM unchanged. Set HOME, SHELL, USER, LOGNAME, PATH.
46 Unset all other environment variables. */ 46 * Unset all other environment variables. */
47 term = getenv("TERM"); 47 term = getenv("TERM");
48 clearenv(); 48 clearenv();
49 if (term) 49 if (term)
@@ -57,7 +57,7 @@ void FAST_FUNC setup_environment(const char *shell, int flags, const struct pass
57 //xsetenv("SHELL", shell); 57 //xsetenv("SHELL", shell);
58 } else if (flags & SETUP_ENV_CHANGEENV) { 58 } else if (flags & SETUP_ENV_CHANGEENV) {
59 /* Set HOME, SHELL, and if not becoming a super-user, 59 /* Set HOME, SHELL, and if not becoming a super-user,
60 USER and LOGNAME. */ 60 * USER and LOGNAME. */
61 if (pw->pw_uid) { 61 if (pw->pw_uid) {
62 shortcut: 62 shortcut:
63 xsetenv("USER", pw->pw_name); 63 xsetenv("USER", pw->pw_name);