Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/libbb/setup_environment.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

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

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

@@ -33 +33 @@
 void FAST_FUNC setup_environment(const char *shell, int flags, const struct passwd *pw)
 {
+    if (!shell || !shell[0])
+        shell = DEFAULT_SHELL;
+
     /* 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_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" : "/");
+        }
     }