Changeset 1208 in kBuild for trunk/src/kash/trap.c

Timestamp:

Oct 7, 2007 5:33:41 PM (17 years ago)

Author:

bird

Message:

trap.c ++.

File:

• trunk/src/kash/trap.c (modified) (26 diffs)

trunk/src/kash/trap.c

@@ -62 +62 @@
 #include "mystring.h"
 #include "var.h"
+#include "shinstance.h"
 
 #ifndef HAVE_SYS_SIGNAME
@@ -81 +82 @@
 
 
-char *trap[NSIG+1];             /* trap handler commands */
-MKINIT char sigmode[NSIG];      /* current value of signal */
-char gotsig[NSIG];              /* indicates specified signal received */
-int pendingsigs;                /* indicates some signal received */
-
-#ifdef __sun__
-typedef void (*sig_t) (int);
-#endif
-static int getsigaction(int, sig_t *);
+//char *trap[NSIG+1];           /* trap handler commands */
+//MKINIT char sigmode[NSIG];    /* current value of signal */
+//char gotsig[NSIG];            /* indicates specified signal received */
+//int pendingsigs;              /* indicates some signal received */
+
+static int getsigaction(shinstance *, int, sh_sig_t *);
 
 /*
@@ -97 +95 @@
 
 static int
-signame_to_signum(const char *p)
+signame_to_signum(shinstance *psh, const char *p)
 {
         int i;
@@ -123 +121 @@
  */
 static void
-printsignals(void)
+printsignals(shinstance *psh)
 {
         int n;
@@ -146 +144 @@
 
 int
-trapcmd(int argc, char **argv)
+trapcmd(shinstance *psh, int argc, char **argv)
 {
         char *action;
@@ -157 +155 @@
         if (argc <= 1) {
                 for (signo = 0 ; signo <= NSIG ; signo++)
-                        if (trap[signo] != NULL) {
+                        if (psh->trap[signo] != NULL) {
                                 out1fmt(psh, "trap -- ");
-                                print_quoted(psh, trap[signo]);
+                                print_quoted(psh, psh->trap[signo]);
                                 out1fmt(psh, " %s\n",
                                     (signo) ? sys_signame[signo] : "EXIT");
@@ -173 +171 @@
                         return 0;
 
-        if (signame_to_signum(*ap) == -1) {
+        if (signame_to_signum(psh, *ap) == -1) {
                 if ((*ap)[0] == '-') {
                         if ((*ap)[1] == '\0')
                                 ap++;
                         else if ((*ap)[1] == 'l' && (*ap)[2] == '\0') {
-                                printsignals();
+                                printsignals(psh);
                                 return 0;
                         }
@@ -192 +190 @@
                         signo = number(psh, *ap);
                 else
-                        signo = signame_to_signum(*ap);
+                        signo = signame_to_signum(psh, *ap);
 
                 if (signo < 0 || signo > NSIG)
@@ -201 +199 @@
                         action = savestr(action);
 
-                if (trap[signo])
-                        ckfree(trap[signo]);
-
-                trap[signo] = action;
+                if (psh->trap[signo])
+                        ckfree(psh->trap[signo]);
+
+                psh->trap[signo] = action;
 
                 if (signo != 0)
@@ -223 +221 @@
 
 void
-clear_traps(int vforked)
+clear_traps(shinstance *psh, int vforked)
 {
         char **tp;
 
-        for (tp = trap ; tp <= &trap[NSIG] ; tp++) {
+        for (tp = psh->trap ; tp <= &psh->trap[NSIG] ; tp++) {
                 if (*tp && **tp) {      /* trap not NULL or SIG_IGN */
                         INTOFF;
@@ -234 +232 @@
                                 *tp = NULL;
                         }
-                        if (tp != &trap[0])
-                                setsignal(psh, tp - trap, vforked);
+                        if (tp != &psh->trap[0])
+                                setsignal(psh, (int)(tp - psh->trap), vforked);
                         INTON;
                 }
@@ -249 +247 @@
 
 long
-setsignal(int signo, int vforked)
+setsignal(shinstance *psh, int signo, int vforked)
 {
         int action;
-        sig_t sigact = SIG_DFL;
+        sh_sig_t sigact = SH_SIG_DFL;
         char *t, tsig;
 
-        if ((t = trap[signo]) == NULL)
+        if ((t = psh->trap[signo]) == NULL)
                 action = S_DFL;
         else if (*t != '\0')
@@ -264 +262 @@
                 switch (signo) {
                 case SIGINT:
-                        if (iflag(psh) || minusc || sflag(psh) == 0)
+                        if (iflag(psh) || psh->minusc || sflag(psh) == 0)
                                 action = S_CATCH;
                         break;
@@ -287 +285 @@
         }
 
-        t = &sigmode[signo - 1];
+        t = &psh->sigmode[signo - 1];
         tsig = *t;
         if (tsig == 0) {
@@ -293 +291 @@
                  * current setting unknown
                  */
-                if (!getsigaction(signo, &sigact)) {
+                if (!getsigaction(psh, signo, &sigact)) {
                         /*
                          * Pretend it worked; maybe we should give a warning
@@ -301 +299 @@
                         return 0;
                 }
-                if (sigact == SIG_IGN) {
+                if (sigact == SH_SIG_IGN) {
                         if (mflag(psh) && (signo == SIGTSTP ||
                              signo == SIGTTIN || signo == SIGTTOU)) {
@@ -314 +312 @@
                 return 0;
         switch (action) {
-                case S_DFL:     sigact = SIG_DFL;       break;
+                case S_DFL:     sigact = SH_SIG_DFL;    break;
                 case S_CATCH:   sigact = onsig;         break;
-                case S_IGN:     sigact = SIG_IGN;       break;
+                case S_IGN:     sigact = SH_SIG_IGN;    break;
         }
         if (!vforked)
                 *t = action;
         siginterrupt(signo, 1);
-        return (long)signal(signo, sigact);
+        return (long)sh_signal(psh, signo, sigact);
 }
 
@@ -328 +326 @@
  */
 static int
-getsigaction(int signo, sig_t *sigact)
-{
-        struct sigaction sa;
-
-        if (sigaction(signo, (struct sigaction *)0, &sa) == -1)
+getsigaction(shinstance *psh, int signo, sh_sig_t *sigact)
+{
+        struct sh_sigaction sa;
+
+        if (sh_sigaction(signo, NULL, &sa) == -1)
                 return 0;
-        *sigact = (sig_t) sa.sa_handler;
+        *sigact = (sh_sig_t)sa.sh_handler;
         return 1;
 }
@@ -343 +341 @@
 
 void
-ignoresig(int signo, int vforked)
-{
-        if (sigmode[signo - 1] != S_IGN && sigmode[signo - 1] != S_HARD_IGN) {
-                signal(signo, SIG_IGN);
+ignoresig(shinstance *psh, int signo, int vforked)
+{
+        if (psh->sigmode[signo - 1] != S_IGN && psh->sigmode[signo - 1] != S_HARD_IGN) {
+                sh_signal(psh, signo, SH_SIG_IGN);
         }
         if (!vforked)
-                sigmode[signo - 1] = S_HARD_IGN;
+                psh->sigmode[signo - 1] = S_HARD_IGN;
 }
 
@@ -361 +359 @@
 
         clear_traps(psh, s0);
-        for (sm = sigmode ; sm < sigmode + NSIG ; sm++) {
+        for (sm = psh->sigmode ; sm < psh->sigmode + NSIG ; sm++) {
                 if (*sm == S_IGN)
                         *sm = S_HARD_IGN;
@@ -377 +375 @@
 onsig(shinstance *psh, int signo)
 {
-        signal(signo, onsig);
-        if (signo == SIGINT && trap[SIGINT] == NULL) {
+        sh_signal(psh, signo, onsig);
+        if (signo == SIGINT && psh->trap[SIGINT] == NULL) {
                 onint(psh);
                 return;
         }
-        gotsig[signo - 1] = 1;
-        pendingsigs++;
+        psh->gotsig[signo - 1] = 1;
+        psh->pendingsigs++;
 }
 
@@ -394 +392 @@
 
 void
-dotrap(void)
+dotrap(shinstance *psh)
 {
         int i;
@@ -408 +406 @@
                 psh->gotsig[i - 1] = 0;
                 savestatus=psh->exitstatus;
-                evalstring(psh, trap[i], 0);
+                evalstring(psh, psh->trap[i], 0);
                 psh->exitstatus=savestatus;
         }
@@ -423 +421 @@
 
 void
-setinteractive(int on)
+setinteractive(shinstance *psh, int on)
 {
         static int is_interactive;
@@ -442 +440 @@
 
 void
-exitshell(int status)
+exitshell(shinstance *psh, int status)
 {
         struct jmploc loc1, loc2;
@@ -454 +452 @@
                 goto l2;
         }
-        handler = &loc1;
-        if ((p = trap[0]) != NULL && *p != '\0') {
-                trap[0] = NULL;
+        psh->handler = &loc1;
+        if ((p = psh->trap[0]) != NULL && *p != '\0') {
+                psh->trap[0] = NULL;
                 evalstring(psh, p, 0);
         }
-l1:   handler = &loc2;                  /* probably unnecessary */
+l1:   psh->handler = &loc2;                     /* probably unnecessary */
         output_flushall(psh);
 #if JOBS
         setjobctl(psh, 0);
 #endif
-l2:   _exit(status);
+l2: sh__exit(psh, status);
         /* NOTREACHED */
 }