Changeset 879 for trunk/src/ash-messup/main.c

Timestamp:

Apr 21, 2007, 8:33:35 AM (18 years ago)

Author:

bird

Message:

hacking...

File:

• trunk/src/ash-messup/main.c (modified) (7 diffs)

trunk/src/ash-messup/main.c

@@ -85 +85 @@
 STATIC union node *curcmd;
 STATIC union node *prevcmd;
-#if PROFILE
-short profile_buf[16384];
-extern int etext();
-#endif
 
 STATIC void read_profile(const char *);
@@ -105 +101 @@
 main(int argc, char **argv)
 {
+        shinstance *psh;
+
+        setlocale(LC_ALL, "");
+
+        /*
+         * Create the root shell instance.
+         */
+        psh = create_root_shell(NULL, argc, argv);
+        if (!psh)
+                return 2;
+        return shell_main(psh, argc);
+}       
+
+int 
+shell_main(shinstance *psh, int argc, char **argv)
+{
         struct jmploc jmploc;
         struct stackmark smark;
@@ -110 +122 @@
         char *shinit;
 
-        setlocale(LC_ALL, "");
-
-#if PROFILE
-        monitor(4, etext, profile_buf, sizeof profile_buf, 50);
-#endif
         state = 0;
         if (setjmp(jmploc.loc)) {
@@ -166 +173 @@
                         goto state4;
         }
-        handler = &jmploc;
+        psh->handler = &jmploc;
 #ifdef DEBUG
 #if DEBUG == 2
@@ -174 +181 @@
         trputs("Shell args:  ");  trargs(argv);
 #endif
-        rootpid = getpid();
-        rootshell = 1;
+        psh->rootpid = getpid();
+        psh->rootshell = 1;
 #ifdef _MSC_VER
     {
@@ -187 +194 @@
         if (argv[0] && argv[0][0] == '-') {
                 state = 1;
-                read_profile("/etc/profile");
+                read_profile(psh, "/etc/profile");
 state1:
                 state = 2;
-                read_profile(".profile");
+                read_profile(psh, ".profile");
         }
 state2:
         state = 3;
         if (getuid() == geteuid() && getgid() == getegid()) {
-                if ((shinit = lookupvar("ENV")) != NULL && *shinit != '\0') {
+                if ((shinit = lookupvar(psh, "ENV")) != NULL && *shinit != '\0') {
                         state = 3;
-                        read_profile(shinit);
+                        read_profile(psh, shinit);
                 }
         }
@@ -214 +221 @@
 
                 for (i = 0; i < SIGSSIZE; i++)
-                    setsignal(sigs[i], 0);
-        }
-
-        if (minusc)
-                evalstring(minusc, 0);
-
-        if (sflag || minusc == NULL) {
+                    setsignal(psh, sigs[i], 0);
+        }
+
+        if (psh->minusc)
+                evalstring(psh, psh->minusc, 0);
+
+        if (psh->sflag || minusc == NULL) {
 state4: /* XXX ??? - why isn't this before the "if" statement */
-                cmdloop(1);
-        }
-#if PROFILE
-        monitor(0);
-#endif
-        exitshell(exitstatus);
+                cmdloop(psh, 1);
+        }
+        exitshell(psh, psh->exitstatus);
         /* NOTREACHED */
 }