Changeset 1198 for trunk/src/kash/trap.c

Timestamp:

Oct 6, 2007, 11:19:19 PM (18 years ago)

Author:

bird

Message:

moving globals into shinstance...

File:

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

trunk/src/kash/trap.c

@@ -102 +102 @@
 
         if (is_number(p))
-                return number(p);
+                return number(psh, p);
 
         if (strcasecmp(p, "exit") == 0 )
@@ -190 +190 @@
         while (*ap) {
                 if (is_number(*ap))
-                        signo = number(*ap);
+                        signo = number(psh, *ap);
                 else
                         signo = signame_to_signum(*ap);
@@ -264 +264 @@
                 switch (signo) {
                 case SIGINT:
-                        if (iflag || minusc || sflag == 0)
+                        if (iflag(psh) || minusc || sflag(psh) == 0)
                                 action = S_CATCH;
                         break;
                 case SIGQUIT:
 #ifdef DEBUG
-                        if (debug)
+                        if (debug(psh))
                                 break;
 #endif
                         /* FALLTHROUGH */
                 case SIGTERM:
-                        if (iflag)
+                        if (iflag(psh))
                                 action = S_IGN;
                         break;
@@ -280 +280 @@
                 case SIGTSTP:
                 case SIGTTOU:
-                        if (mflag)
+                        if (mflag(psh))
                                 action = S_IGN;
                         break;
@@ -302 +302 @@
                 }
                 if (sigact == SIG_IGN) {
-                        if (mflag && (signo == SIGTSTP ||
+                        if (mflag(psh) && (signo == SIGTSTP ||
                              signo == SIGTTIN || signo == SIGTTOU)) {
                                 tsig = S_IGN;   /* don't hard ignore these */