Bump to version 1.22.1

[platform/upstream/busybox.git] / libbb / setup_environment.c

diff --git a/libbb/setup_environment.c b/libbb/setup_environment.c
index 18d5a06..4258656 100644 (file)
--- a/libbb/setup_environment.c
+++ b/libbb/setup_environment.c
@@ -30,47 +30,45 @@
 
 #include "libbb.h"
 
-/* util-linux manpage says /sbin:/bin:/usr/sbin:/usr/bin,
- * but I want to save a few bytes here */
-static const char DEFAULT_ROOT_LOGIN_PATH[] = "/sbin:/usr/sbin:/bin:/usr/bin";
-#define DEFAULT_LOGIN_PATH (DEFAULT_ROOT_LOGIN_PATH + sizeof("/sbin:/usr/sbin"))
-
-void setup_environment(const char *shell, int loginshell, int changeenv, const struct passwd *pw)
+void FAST_FUNC setup_environment(const char *shell, int flags, const struct passwd *pw)
 {
-       if (loginshell) {
-               const char *term;
+       if (!shell || !shell[0])
+               shell = DEFAULT_SHELL;
 
-               /* Change the current working directory to be the home directory
-                * of the user.  It is a fatal error for this process to be unable
-                * to change to that directory.  There is no "default" home
-                * directory.
-                * Some systems default to HOME=/
-                */
-               if (chdir(pw->pw_dir)) {
-                       xchdir("/");
-                       fputs("warning: cannot change to home directory\n", stderr);
+       /* Change the current working directory to be the home directory
+        * of the user */
+       if (!(flags & SETUP_ENV_NO_CHDIR)) {
+               if (chdir(pw->pw_dir) != 0) {
+                       bb_error_msg("can't change directory to '%s'", pw->pw_dir);
+                       xchdir((flags & SETUP_ENV_TO_TMP) ? "/tmp" : "/");
                }
+       }
+
+       if (flags & SETUP_ENV_CLEARENV) {
+               const char *term;
 
-               /* Leave TERM unchanged.  Set HOME, SHELL, USER, LOGNAME, PATH.
-                  Unset all other environment variables.  */
+               /* Leave TERM unchanged. Set HOME, SHELL, USER, LOGNAME, PATH.
+                * Unset all other environment variables.  */
                term = getenv("TERM");
                clearenv();
                if (term)
                        xsetenv("TERM", term);
-               xsetenv("HOME",    pw->pw_dir);
-               xsetenv("SHELL",   shell);
-               xsetenv("USER",    pw->pw_name);
-               xsetenv("LOGNAME", pw->pw_name);
-               xsetenv("PATH",   (pw->pw_uid ? DEFAULT_LOGIN_PATH : DEFAULT_ROOT_LOGIN_PATH));
-       }
-       else if (changeenv) {
+               xsetenv("PATH", (pw->pw_uid ? bb_default_path : bb_default_root_path));
+               goto shortcut;
+               // No, gcc (4.2.1) is not clever enougn to do it itself.
+               //xsetenv("USER",    pw->pw_name);
+               //xsetenv("LOGNAME", pw->pw_name);
+               //xsetenv("HOME",    pw->pw_dir);
+               //xsetenv("SHELL",   shell);
+       } else if (flags & SETUP_ENV_CHANGEENV) {
                /* Set HOME, SHELL, and if not becoming a super-user,
-                  USER and LOGNAME.  */
-               xsetenv("HOME",  pw->pw_dir);
-               xsetenv("SHELL", shell);
+                * USER and LOGNAME.  */
                if (pw->pw_uid) {
+ shortcut:
                        xsetenv("USER",    pw->pw_name);
                        xsetenv("LOGNAME", pw->pw_name);
                }
+               xsetenv("HOME",    pw->pw_dir);
+               xsetenv("SHELL",   shell);
        }
 }