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

Timestamp:

Apr 21, 2007, 10:47:37 AM (18 years ago)

Author:

bird

Message:

hacking...

File:

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

trunk/src/ash-messup/main.c

@@ -78 +78 @@
 #include "exec.h"
 #include "cd.h"
+#include "shinstance.h"
 
 #define PROFILE 0
@@ -86 +87 @@
 STATIC union node *prevcmd;
 
-STATIC void read_profile(const char *);
-STATIC char *find_dot_file(char *);
+STATIC void read_profile(struct shinstance *, const char *);
+STATIC char *find_dot_file(struct shinstance *, char *);
 int main(int, char **);
 int shell_main(shinstance *, int, char **);
@@ -121 +122 @@
                 return 2;
         shthread_set_shell(psh);
-        return shell_main(psh, argc);
+        return shell_main(psh, argc, argv);
 }       
 
@@ -144 +145 @@
                         psh->rootshell = 1;
                         psh->minusc = NULL;
-                        psh->state = 3;
+                        state = 3;
                         break;
 
@@ -160 +161 @@
 
                 if (psh->exception != EXSHELLPROC) {
-                        if (state == 0 || iflag == 0 || ! psh->rootshell)
-                                exitshell(psh, exitstatus);
+                        if (state == 0 || psh->iflag == 0 || ! psh->rootshell)
+                                exitshell(psh, psh->exitstatus);
                 }
                 reset(psh);
@@ -170 +171 @@
                  ) {
                         out2c(psh, '\n');
-                        flushout(&errout);
+                        flushout(&psh->errout);
                 }
                 popstackmark(psh, &smark);
@@ -232 +233 @@
                 evalstring(psh, psh->minusc, 0);
 
-        if (psh->sflag || minusc == NULL) {
+        if (psh->sflag || psh->minusc == NULL) {
 state4: /* XXX ??? - why isn't this before the "if" statement */
                 cmdloop(psh, 1);
@@ -238 +239 @@
         exitshell(psh, psh->exitstatus);
         /* NOTREACHED */
+        return 1;
 }
 
@@ -343 +345 @@
                 setinputfd(psh, fd, 1);
         else
-                error("Can't open %s", name);
+                error(psh, "Can't open %s", name);
         INTON;
         cmdloop(psh, 0);
@@ -380 +382 @@
 
         /* not found in the PATH */
-        error("%s: not found", basename);
+        error(psh, "%s: not found", basename);
         /* NOTREACHED */
+        return NULL;
 }
 
@@ -412 +415 @@
         if (argc > 1)
                 psh->exitstatus = number(argv[1]);
-        exitshell(psh, exitstatus);
+        exitshell(psh, psh->exitstatus);
         /* NOTREACHED */
+        return 1;
 }