Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/libbb/setup_environment.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/libbb/setup_environment.c (modified) (2 diffs)

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

@@ -29 +29 @@
  */
 
-#include <stdio.h>
-#include <errno.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <syslog.h>
-#include <ctype.h>
 #include "libbb.h"
 
-
-
-#define DEFAULT_LOGIN_PATH      "/bin:/usr/bin"
-#define DEFAULT_ROOT_LOGIN_PATH "/usr/sbin:/bin:/usr/bin:/sbin"
-
-static void xsetenv ( const char *key, const char *value )
+void setup_environment(const char *shell, int loginshell, int changeenv, const struct passwd *pw)
 {
-        if ( setenv ( key, value, 1 ))
-                bb_error_msg_and_die (bb_msg_memory_exhausted);
-}
-
-void setup_environment ( const char *shell, int loginshell, int changeenv, const struct passwd *pw )
-{
-    if ( loginshell ) {
+    if (loginshell) {
         const char *term;
 
@@ -60 +42 @@
          * Some systems default to HOME=/
          */
-        if ( chdir ( pw-> pw_dir )) {
-            if ( chdir ( "/" )) {
-                syslog ( LOG_WARNING, "unable to cd to %s' for user %s'\n", pw-> pw_dir, pw-> pw_name );
-                bb_error_msg_and_die ( "cannot cd to home directory or /" );
-            }
-            fputs ( "warning: cannot change to home directory\n", stderr );
+        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.  */
-        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 ));
+        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 ) {
+    else if (changeenv) {
         /* Set HOME, SHELL, and if not becoming a super-user,
            USER and LOGNAME.  */
-        xsetenv ( "HOME",  pw-> pw_dir );
-        xsetenv ( "SHELL", shell );
-        if  ( pw-> pw_uid ) {
-            xsetenv ( "USER",    pw-> pw_name );
-            xsetenv ( "LOGNAME", pw-> pw_name );
+        xsetenv("HOME",  pw->pw_dir);
+        xsetenv("SHELL", shell);
+        if (pw->pw_uid) {
+            xsetenv("USER",    pw->pw_name);
+            xsetenv("LOGNAME", pw->pw_name);
         }
     }
 }
-