Changeset 883 for trunk/src/ash-messup/error.c

Timestamp:

Apr 21, 2007, 10:55:18 PM (18 years ago)

Author:

bird

Message:

hacking...

File:

• trunk/src/ash-messup/error.c (modified) (13 diffs)

trunk/src/ash-messup/error.c

@@ -61 +61 @@
 #include "error.h"
 #include "show.h"
+#include "shinstance.h"
 
 
@@ -67 +68 @@
  */
 
-struct jmploc *handler;
+/*struct jmploc *handler;
 int exception;
 volatile int suppressint;
 volatile int intpending;
-char *commandname;
-
-
-static void exverror(int, const char *, va_list)
-    __attribute__((__noreturn__));
+char *commandname;*/
+
+
+static void exverror(shinstance *psh, int, const char *, va_list)
+    /*__attribute__((__noreturn__))*/;
 
 /*
@@ -84 +85 @@
 
 void
-exraise(int e)
-{
-        if (handler == NULL)
+exraise(shinstance *psh, int e)
+{
+        if (psh->handler == NULL)
                 abort();
-        exception = e;
-        longjmp(handler->loc, 1);
+        psh->exception = e;
+        longjmp(psh->handler->loc, 1);
 }
 
@@ -104 +105 @@
 
 void
-onint(void)
-{
-        sigset_t nsigset;
-
-        if (suppressint) {
-                intpending = 1;
+onint(shinstance *psh)
+{
+        sh_sigset_t nsigset;
+
+        if (psh->suppressint) {
+                psh->intpending = 1;
                 return;
         }
-        intpending = 0;
-        sigemptyset(&nsigset);
-        sigprocmask(SIG_SETMASK, &nsigset, NULL);
-        if (rootshell && iflag)
-                exraise(EXINT);
+        psh->intpending = 0;
+        sh_sigemptyset(&nsigset);
+        sh_sigprocmask(psh, SIG_SETMASK, &nsigset, NULL);
+        if (psh->rootshell && psh->iflag)
+                exraise(psh, EXINT);
         else {
-                signal(SIGINT, SIG_DFL);
-                raise(SIGINT);
+                sh_signal(psh, SIGINT, SIG_DFL);
+                sh_raise_sigint(psh);/*raise(psh, SIGINT);*/
         }
         /* NOTREACHED */
@@ -125 +126 @@
 
 static void
-exvwarning(int sv_errno, const char *msg, va_list ap)
+exvwarning(shinstance *psh, int sv_errno, const char *msg, va_list ap)
 {
         /* Partially emulate line buffered output so that:
@@ -133 +134 @@
          * both generate sensible text when stdout and stderr are merged.
          */
-        if (output.nextc != output.buf && output.nextc[-1] == '\n')
-                flushout(&output);
-        if (commandname)
-                outfmt(&errout, "%s: ", commandname);
+        if (psh->output.nextc != psh->output.buf && psh->output.nextc[-1] == '\n')
+                flushout(&psh->output);
+        if (psh->commandname)
+                outfmt(&psh->errout, "%s: ", psh->commandname);
         if (msg != NULL) {
-                doformat(&errout, msg, ap);
+                doformat(&psh->errout, msg, ap);
                 if (sv_errno >= 0)
-                        outfmt(&errout, ": ");
+                        outfmt(&psh->errout, ": ");
         }
         if (sv_errno >= 0)
-                outfmt(&errout, "%s", strerror(sv_errno));
-        out2c('\n');
-        flushout(&errout);
+                outfmt(&psh->errout, "%s", strerror(sv_errno));
+        out2c(psh, '\n');
+        flushout(&psh->errout);
 }
 
@@ -154 +155 @@
  */
 static void
-exverror(int cond, const char *msg, va_list ap)
+exverror(shinstance *psh, int cond, const char *msg, va_list ap)
 {
         CLEAR_PENDING_INT;
@@ -168 +169 @@
 #endif
         if (msg)
-                exvwarning(-1, msg, ap);
-
-        output_flushall();
-        exraise(cond);
+                exvwarning(psh, -1, msg, ap);
+
+        output_flushall(psh);
+        exraise(psh, cond);
         /* NOTREACHED */
 }
@@ -177 +178 @@
 
 void
-error(const char *msg, ...)
+error(shinstance *psh, const char *msg, ...)
 {
         va_list ap;
 
         va_start(ap, msg);
-        exverror(EXERROR, msg, ap);
+        exverror(psh, EXERROR, msg, ap);
         /* NOTREACHED */
         va_end(ap);
@@ -189 +190 @@
 
 void
-exerror(int cond, const char *msg, ...)
+exerror(shinstance *psh, int cond, const char *msg, ...)
 {
         va_list ap;
 
         va_start(ap, msg);
-        exverror(cond, msg, ap);
+        exverror(psh, cond, msg, ap);
         /* NOTREACHED */
         va_end(ap);
@@ -204 +205 @@
 
 void
-sh_exit(int rval)
-{
-        exerrno = rval & 255;
-        exraise(EXEXEC);
-}
-
-void
-sh_err(int status, const char *fmt, ...)
+sh_exit(shinstance *psh, int rval)
+{
+        psh->exerrno = rval & 255;
+        exraise(psh, EXEXEC);
+}
+
+void
+sh_err(shinstance *psh, int status, const char *fmt, ...)
 {
         va_list ap;
 
         va_start(ap, fmt);
-        exvwarning(errno, fmt, ap);
-        va_end(ap);
-        sh_exit(status);
-}
-
-void
-sh_verr(int status, const char *fmt, va_list ap)
-{
-        exvwarning(errno, fmt, ap);
-        sh_exit(status);
-}
-
-void
-sh_errx(int status, const char *fmt, ...)
+        exvwarning(psh, errno, fmt, ap);
+        va_end(ap);
+        sh_exit(psh, status);
+}
+
+void
+sh_verr(shinstance *psh, int status, const char *fmt, va_list ap)
+{
+        exvwarning(psh, errno, fmt, ap);
+        sh_exit(psh, status);
+}
+
+void
+sh_errx(shinstance *psh, int status, const char *fmt, ...)
 {
         va_list ap;
 
         va_start(ap, fmt);
-        exvwarning(-1, fmt, ap);
-        va_end(ap);
-        sh_exit(status);
-}
-
-void
-sh_verrx(int status, const char *fmt, va_list ap)
-{
-        exvwarning(-1, fmt, ap);
-        sh_exit(status);
-}
-
-void
-sh_warn(const char *fmt, ...)
+        exvwarning(psh, -1, fmt, ap);
+        va_end(ap);
+        sh_exit(psh, status);
+}
+
+void
+sh_verrx(shinstance *psh, int status, const char *fmt, va_list ap)
+{
+        exvwarning(psh, -1, fmt, ap);
+        sh_exit(psh, status);
+}
+
+void
+sh_warn(shinstance *psh, const char *fmt, ...)
 {
         va_list ap;
 
         va_start(ap, fmt);
-        exvwarning(errno, fmt, ap);
-        va_end(ap);
-}
-
-void
-sh_vwarn(const char *fmt, va_list ap)
-{
-        exvwarning(errno, fmt, ap);
-}
-
-void
-sh_warnx(const char *fmt, ...)
+        exvwarning(psh, errno, fmt, ap);
+        va_end(ap);
+}
+
+void
+sh_vwarn(shinstance *psh, const char *fmt, va_list ap)
+{
+        exvwarning(psh, errno, fmt, ap);
+}
+
+void
+sh_warnx(shinstance *psh, const char *fmt, ...)
 {
         va_list ap;
 
         va_start(ap, fmt);
-        exvwarning(-1, fmt, ap);
-        va_end(ap);
-}
-
-void
-sh_vwarnx(const char *fmt, va_list ap)
-{
-        exvwarning(-1, fmt, ap);
+        exvwarning(psh, -1, fmt, ap);
+        va_end(ap);
+}
+
+void
+sh_vwarnx(shinstance *psh, const char *fmt, va_list ap)
+{
+        exvwarning(psh, -1, fmt, ap);
 }
 
@@ -357 +358 @@
 
 const char *
-errmsg(int e, int action)
+errmsg(shinstance *psh, int e, int action)
 {
         struct errname const *ep;
-        static char buf[12];
+        /*static char buf[12];*/
 
         for (ep = errormsg ; ep->errcode ; ep++) {
@@ -366 +367 @@
                         return ep->msg;
         }
-        fmtstr(buf, sizeof buf, "error %d", e);
-        return buf;
-}
+        fmtstr(psh->errmsg_buf, sizeof psh->errmsg_buf, "error %d", e);
+        return psh->errmsg_buf;
+}