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

Timestamp:

Oct 7, 2007, 10:39:58 PM (18 years ago)

Author:

bird

Message:

some more cleanup.

File:

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

trunk/src/kash/trap.c

@@ -33 +33 @@
  */
 
-#ifdef HAVE_SYS_CDEFS_H
-#include <sys/cdefs.h>
-#endif
+#if 0
 #ifndef lint
-#if 0
 static char sccsid[] = "@(#)trap.c      8.5 (Berkeley) 6/5/95";
 #else
 __RCSID("$NetBSD: trap.c,v 1.31 2005/01/11 19:38:57 christos Exp $");
-#endif
 #endif /* not lint */
-
-#include <signal.h>
-#include <unistd.h>
+#endif
+
 #include <stdlib.h>
 
@@ -112 +107 @@
 #endif
         for (i = 0; i < NSIG; ++i)
-                if (strcasecmp (p, sys_signame[i]) == 0)
+                if (strcasecmp(p, sys_signame[i]) == 0)
                         return i;
         return -1;
@@ -246 +241 @@
  */
 
-long
+void
 setsignal(shinstance *psh, int signo, int vforked)
 {
@@ -297 +292 @@
                          * sigmode, so that we retry every time.
                          */
-                        return 0;
+                        return;
                 }
                 if (sigact == SH_SIG_IGN) {
@@ -310 +305 @@
         }
         if (tsig == S_HARD_IGN || tsig == action)
-                return 0;
+                return;
         switch (action) {
                 case S_DFL:     sigact = SH_SIG_DFL;    break;
@@ -318 +313 @@
         if (!vforked)
                 *t = action;
-        siginterrupt(signo, 1);
-        return (long)sh_signal(psh, signo, sigact);
+        sh_siginterrupt(psh, signo, 1);
+        sh_signal(psh, signo, sigact);
 }