Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/libbb/setup_environment.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/libbb/setup_environment.c (modified) (1 diff)

branches/2.2.9/mindi-busybox/libbb/setup_environment.c

@@ -31 +31 @@
 #include "libbb.h"
 
-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) {
+    /* Change the current working directory to be the home directory
+     * of the user */
+    if (chdir(pw->pw_dir)) {
+        xchdir((flags & SETUP_ENV_TO_TMP) ? "/tmp" : "/");
+        bb_error_msg("can't chdir to home directory '%s'", pw->pw_dir);
+    }
+
+    if (flags & SETUP_ENV_CLEARENV) {
         const char *term;
 
-        /* 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);
-        }
-
-        /* 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 ? bb_default_path : bb_default_root_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);
     }
 }