Changeset 1077 in kBuild for trunk/src/ash

Timestamp:

Jul 19, 2007 3:54:33 PM (17 years ago)

Author:

bird

Message:

Drop all the .profile, /etc/profile and ENV stuff as that will screw up sometimes.

File:

• trunk/src/ash/main.c (modified) (5 diffs)

trunk/src/ash/main.c

@@ -90 +90 @@
 #endif
 
+#ifdef KMK
+#error "Huh? KMK isn't defined!"
+#else
 STATIC void read_profile(const char *);
+#endif
 STATIC char *find_dot_file(char *);
 int main(int, char **);
@@ -187 +191 @@
         if (argv[0] && argv[0][0] == '-') {
                 state = 1;
+#ifndef KMK
                 read_profile("/etc/profile");
+#endif
 state1:
                 state = 2;
+#ifndef KMK
                 read_profile(".profile");
+#endif
         }
 state2:
         state = 3;
+#ifndef KMK
         if (getuid() == geteuid() && getgid() == getegid()) {
                 if ((shinit = lookupvar("ENV")) != NULL && *shinit != '\0') {
@@ -200 +209 @@
                 }
         }
+#endif
 state3:
         state = 4;
@@ -285 +295 @@
 
 
+#ifndef KMK
 /*
  * Read /etc/profile or .profile.  Return on error.
@@ -318 +329 @@
         popfile();
 }
+#endif /* !KMK */