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

Timestamp:

Apr 21, 2007, 9:47:39 AM (18 years ago)

Author:

bird

Message:

hacking...

File:

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

trunk/src/ash-messup/main.c

@@ -81 +81 @@
 #define PROFILE 0
 
-int rootpid;
-int rootshell;
+/*int rootpid;
+int rootshell;*/
 STATIC union node *curcmd;
 STATIC union node *prevcmd;
@@ -89 +89 @@
 STATIC char *find_dot_file(char *);
 int main(int, char **);
+int shell_main(shinstance *, int, char **);
+#ifdef _MSC_VER
+extern void init_syntax(void);
+#endif
 
 /*
@@ -103 +107 @@
         shinstance *psh;
 
+        /*
+         * Global initializations. 
+         */
         setlocale(LC_ALL, "");
-
+#ifdef _MSC_VER
+        init_syntax();
+#endif
         /*
          * Create the root shell instance.
@@ -111 +120 @@
         if (!psh)
                 return 2;
+        shthread_set_shell(psh);
         return shell_main(psh, argc);
 }       
@@ -129 +139 @@
                  * the shell procedure.
                  */
-                switch (exception) {
+                switch (psh->exception) {
                 case EXSHELLPROC:
-                        rootpid = getpid();
-                        rootshell = 1;
-                        minusc = NULL;
-                        state = 3;
+                        psh->rootpid = /*getpid()*/ psh->pid;
+                        psh->rootshell = 1;
+                        psh->minusc = NULL;
+                        psh->state = 3;
                         break;
 
                 case EXEXEC:
-                        exitstatus = exerrno;
+                        psh->exitstatus = psh->exerrno;
                         break;
 
                 case EXERROR:
-                        exitstatus = 2;
+                        psh->exitstatus = 2;
                         break;
 
@@ -149 +159 @@
                 }
 
-                if (exception != EXSHELLPROC) {
-                        if (state == 0 || iflag == 0 || ! rootshell)
-                                exitshell(exitstatus);
-                }
-                reset();
-                if (exception == EXINT
+                if (psh->exception != EXSHELLPROC) {
+                        if (state == 0 || iflag == 0 || ! psh->rootshell)
+                                exitshell(psh, exitstatus);
+                }
+                reset(psh);
+                if (psh->exception == EXINT
 #if ATTY
-                 && (! attyset() || equal(termval(), "emacs"))
+                 && (! attyset(psh) || equal(termval(psh), "emacs"))
 #endif
                  ) {
-                        out2c('\n');
+                        out2c(psh, '\n');
                         flushout(&errout);
                 }
-                popstackmark(&smark);
+                popstackmark(psh, &smark);
                 FORCEINTON;                             /* enable interrupts */
                 if (state == 1)
@@ -174 +184 @@
         }
         psh->handler = &jmploc;
+        psh->rootpid = /*getpid()*/ psh->pid;
+        psh->rootshell = 1;
 #ifdef DEBUG
 #if DEBUG == 2
         debug = 1;
 #endif
-        opentrace();
+        opentrace(psh);
         trputs("Shell args:  ");  trargs(argv);
 #endif
-        psh->rootpid = getpid();
-        psh->rootshell = 1;
-#ifdef _MSC_VER
-    {
-        extern void init_syntax(void);
-        init_syntax();
-    }
-#endif
-        init();
-        setstackmark(&smark);
-        procargs(argc, argv);
+
+        init(psh);
+        setstackmark(psh, &smark);
+        procargs(psh, argc, argv);
         if (argv[0] && argv[0][0] == '-') {
                 state = 1;
@@ -209 +214 @@
 state3:
         state = 4;
-        if (sflag == 0 || minusc) {
+        if (psh->sflag == 0 || psh->minusc) {
                 static int sigs[] =  {
                     SIGINT, SIGQUIT, SIGHUP,
@@ -242 +247 @@
 
 void
-cmdloop(int top)
+cmdloop(struct shinstance *psh, int top)
 {
         union node *n;
@@ -250 +255 @@
 
         TRACE(("cmdloop(%d) called\n", top));
-        setstackmark(&smark);
+        setstackmark(psh, &smark);
         for (;;) {
-                if (pendingsigs)
-                        dotrap();
+                if (psh->pendingsigs)
+                        dotrap(psh);
                 inter = 0;
-                if (iflag && top) {
+                if (psh->iflag && top) {
                         inter = 1;
-                        showjobs(out2, SHOW_CHANGED);
-                        chkmail(0);
-                        flushout(&errout);
-                }
-                n = parsecmd(inter);
+                        showjobs(psh, psh->out2, SHOW_CHANGED);
+                        chkmail(psh, 0);
+                        flushout(&psh->errout);
+                }
+                n = parsecmd(psh, inter);
                 /* showtree(n); DEBUG */
                 if (n == NEOF) {
                         if (!top || numeof >= 50)
                                 break;
-                        if (!stoppedjobs()) {
-                                if (!Iflag)
+                        if (!stoppedjobs(psh)) {
+                                if (!psh->Iflag)
                                         break;
-                                out2str("\nUse \"exit\" to leave shell.\n");
+                                out2str(psh, "\nUse \"exit\" to leave shell.\n");
                         }
                         numeof++;
-                } else if (n != NULL && nflag == 0) {
-                        job_warning = (job_warning == 2) ? 1 : 0;
+                } else if (n != NULL && psh->nflag == 0) {
+                        psh->job_warning = (psh->job_warning == 2) ? 1 : 0;
                         numeof = 0;
-                        evaltree(n, 0);
-                }
-                popstackmark(&smark);
-                setstackmark(&smark);
-                if (evalskip == SKIPFILE) {
-                        evalskip = 0;
+                        evaltree(psh, n, 0);
+                }
+                popstackmark(psh, &smark);
+                setstackmark(psh, &smark);
+                if (psh->evalskip == SKIPFILE) {
+                        psh->evalskip = 0;
                         break;
                 }
         }
-        popstackmark(&smark);
+        popstackmark(psh, &smark);
 }
 
@@ -294 +299 @@
 
 STATIC void
-read_profile(const char *name)
+read_profile(struct shinstance *psh, const char *name)
 {
         int fd;
@@ -301 +306 @@
 
         INTOFF;
-        if ((fd = open(name, O_RDONLY)) >= 0)
-                setinputfd(fd, 1);
+        if ((fd = shfile_open(psh, name, O_RDONLY)) >= 0)
+                setinputfd(psh, fd, 1);
         INTON;
         if (fd < 0)
                 return;
         /* -q turns off -x and -v just when executing init files */
-        if (qflag)  {
-            if (xflag)
-                    xflag = 0, xflag_set = 1;
-            if (vflag)
-                    vflag = 0, vflag_set = 1;
-        }
-        cmdloop(0);
-        if (qflag)  {
+        if (psh->qflag)  {
+            if (psh->xflag)
+                    psh->xflag = 0, xflag_set = 1;
+            if (psh->vflag)
+                    psh->vflag = 0, vflag_set = 1;
+        }
+        cmdloop(psh, 0);
+        if (psh->qflag)  {
             if (xflag_set)
-                    xflag = 1;
+                    psh->xflag = 1;
             if (vflag_set)
-                    vflag = 1;
-        }
-        popfile();
+                    psh->vflag = 1;
+        }
+        popfile(psh);
 }
 
@@ -330 +335 @@
 
 void
-readcmdfile(char *name)
+readcmdfile(struct shinstance *psh, char *name)
 {
         int fd;
@@ -336 +341 @@
         INTOFF;
         if ((fd = open(name, O_RDONLY)) >= 0)
-                setinputfd(fd, 1);
+                setinputfd(psh, fd, 1);
         else
                 error("Can't open %s", name);
         INTON;
-        cmdloop(0);
-        popfile();
+        cmdloop(psh, 0);
+        popfile(psh);
 }
 
@@ -353 +358 @@
 
 STATIC char *
-find_dot_file(char *basename)
+find_dot_file(struct shinstance *psh, char *basename)
 {
         char *fullname;
-        const char *path = pathval();
+        const char *path = pathval(psh);
         struct stat statb;
 
@@ -363 +368 @@
                 return basename;
 
-        while ((fullname = padvance(&path, basename)) != NULL) {
+        while ((fullname = padvance(psh, &path, basename)) != NULL) {
                 if ((stat(fullname, &statb) == 0) && S_ISREG(statb.st_mode)) {
                         /*
@@ -371 +376 @@
                         return fullname;
                 }
-                stunalloc(fullname);
+                stunalloc(psh, fullname);
         }
 
@@ -380 +385 @@
 
 int
-dotcmd(int argc, char **argv)
-{
-        exitstatus = 0;
+dotcmd(struct shinstance *psh, int argc, char **argv)
+{
+        psh->exitstatus = 0;
 
         if (argc >= 2) {                /* That's what SVR2 does */
@@ -388 +393 @@
                 struct stackmark smark;
 
-                setstackmark(&smark);
-                fullname = find_dot_file(argv[1]);
-                setinputfile(fullname, 1);
-                commandname = fullname;
-                cmdloop(0);
-                popfile();
-                popstackmark(&smark);
-        }
-        return exitstatus;
+                setstackmark(psh, &smark);
+                fullname = find_dot_file(psh, argv[1]);
+                setinputfile(psh, fullname, 1);
+                psh->commandname = fullname;
+                cmdloop(psh, 0);
+                popfile(psh);
+                popstackmark(psh, &smark);
+        }
+        return psh->exitstatus;
 }
 
 
 int
-exitcmd(int argc, char **argv)
-{
-        if (stoppedjobs())
+exitcmd(struct shinstance *psh, int argc, char **argv)
+{
+        if (stoppedjobs(psh))
                 return 0;
         if (argc > 1)
-                exitstatus = number(argv[1]);
-        exitshell(exitstatus);
+                psh->exitstatus = number(argv[1]);
+        exitshell(psh, exitstatus);
         /* NOTREACHED */
 }
+
+/*
+ * Local Variables:
+ *   c-file-style: bsd
+ * End:
+ */