patch-2.1.70 linux/kernel/signal.c

• Lines: 72
• Date: Tue Dec 2 09:15:11 1997
• Orig file: v2.1.69/linux/kernel/signal.c
• Orig date: Mon Dec 1 12:04:15 1997

diff -u --recursive --new-file v2.1.69/linux/kernel/signal.c linux/kernel/signal.c
@@ -55,7 +55,7 @@
 {
 	struct signal_queue *q, *n;
 
-	t->flags &= ~PF_SIGPENDING;
+	t->sigpending = 0;
 	sigemptyset(&t->signal);
 	q = t->sigqueue;
 	t->sigqueue = NULL;
@@ -75,7 +75,15 @@
 void
 flush_signal_handlers(struct task_struct *t)
 {
-	memset(t->sig->action, 0, sizeof(t->sig->action));
+	int i;
+	struct k_sigaction *ka = &t->sig->action[0];
+	for (i = _NSIG ; i != 0 ; i--) {
+		if (ka->sa.sa_handler != SIG_IGN)
+			ka->sa.sa_handler = SIG_DFL;
+		ka->sa.sa_flags = 0;
+		sigemptyset(&ka->sa.sa_mask);
+		ka++;
+	}
 }
 
 /*
@@ -93,7 +101,7 @@
 
 #if DEBUG_SIG
 printk("SIG dequeue (%s:%d): %d ", current->comm, current->pid,
-	(current->flags & PF_SIGPENDING) != 0);
+	signal_pending(current));
 #endif
 
 	/* Find the first desired signal that is pending.  */
@@ -186,15 +194,14 @@
 		   "process" as well.  */
 
 		/* Sanity check... */
-		if (mask == &current->blocked &&
-		    (current->flags & PF_SIGPENDING) != 0) {
+		if (mask == &current->blocked && signal_pending(current)) {
 			printk(KERN_CRIT "SIG: sigpending lied\n");
-			current->flags &= ~PF_SIGPENDING;
+			current->sigpending = 0;
 		}
 	}
 
 #if DEBUG_SIG
-printk(" %d -> %d\n", (current->flags & PF_SIGPENDING) != 0, sig);
+printk(" %d -> %d\n", signal_pending(current), sig);
 #endif
 
 	return sig;
@@ -331,7 +338,7 @@
 
 	sigaddset(&t->signal, sig);
 	if (!sigismember(&t->blocked, sig))
-		t->flags |= PF_SIGPENDING;
+		t->sigpending = 1;
 
 out:
 	spin_unlock_irqrestore(&t->sigmask_lock, flags);
@@ -340,7 +347,7 @@
 
 out_nolock:
 #if DEBUG_SIG
-printk(" %d -> %d\n", (t->flags & PF_SIGPENDING) != 0, ret);
+printk(" %d -> %d\n", signal_pending(t), ret);
 #endif
 
 	return ret;