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

Timestamp:

Oct 7, 2007, 12:04:05 AM (18 years ago)

Author:

bird

Message:

moving globals into shinstance...

File:

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

trunk/src/kash/trap.c

@@ -127 +127 @@
         int n;
 
-        out1str("EXIT ");
+        out1str(psh, "EXIT ");
 #ifndef HAVE_SYS_SIGNAME
         init_sys_signame();
@@ -133 +133 @@
 
         for (n = 1; n < NSIG; n++) {
-                out1fmt("%s", sys_signame[n]);
+                out1fmt(psh, "%s", sys_signame[n]);
                 if ((n == NSIG/2) ||  n == (NSIG - 1))
-                        out1str("\n");
+                        out1str(psh, "\n");
                 else
-                        out1c(' ');
+                        out1c(psh, ' ');
         }
 }
@@ -158 +158 @@
                 for (signo = 0 ; signo <= NSIG ; signo++)
                         if (trap[signo] != NULL) {
-                                out1fmt("trap -- ");
+                                out1fmt(psh, "trap -- ");
                                 print_quoted(trap[signo]);
-                                out1fmt(" %s\n",
+                                out1fmt(psh, " %s\n",
                                     (signo) ? sys_signame[signo] : "EXIT");
                         }
@@ -182 +182 @@
                         }
                         else
-                                error("bad option %s\n", *ap);
+                                error(psh, "bad option %s\n", *ap);
                 }
                 else
@@ -195 +195 @@
 
                 if (signo < 0 || signo > NSIG)
-                        error("%s: bad trap", *ap);
+                        error(psh, "%s: bad trap", *ap);
 
                 INTOFF;
@@ -375 +375 @@
 
 void
-onsig(int signo)
+onsig(shinstance *psh, int signo)
 {
         signal(signo, onsig);
         if (signo == SIGINT && trap[SIGINT] == NULL) {
-                onint();
+                onint(psh);
                 return;
         }
@@ -447 +447 @@
         char *p;
 
-        TRACE(("pid %d, exitshell(%d)\n", getpid(), status));
+        TRACE((psh, "pid %d, exitshell(%d)\n", getpid(), status));
         if (setjmp(loc1.loc)) {
                 goto l1;
@@ -460 +460 @@
         }
 l1:   handler = &loc2;                  /* probably unnecessary */
-        output_flushall();
+        output_flushall(psh);
 #if JOBS
         setjobctl(0);