CVS commit: src/usr.bin/mail

[David Young]

Module Name:    src
Committed By:   dyoung
Date:           Mon Jan 10 17:14:38 UTC 2011

Modified Files:
        src/usr.bin/mail: sig.c

Log Message:
Rename sigqueue to sigq to avoid clashing with sigqueue(2).  Now this
builds again.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/mail/sig.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/usr.bin/mail/sig.c
diff -u src/usr.bin/mail/sig.c:1.1 src/usr.bin/mail/sig.c:1.2
--- src/usr.bin/mail/sig.c:1.1	Fri Apr 10 13:08:25 2009
+++ src/usr.bin/mail/sig.c	Mon Jan 10 17:14:38 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: sig.c,v 1.1 2009/04/10 13:08:25 christos Exp $	*/
+/*	$NetBSD: sig.c,v 1.2 2011/01/10 17:14:38 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: sig.c,v 1.1 2009/04/10 13:08:25 christos Exp $");
+__RCSID("$NetBSD: sig.c,v 1.2 2011/01/10 17:14:38 dyoung Exp $");
 #endif /* not lint */
 
 #include <assert.h>
@@ -59,7 +59,7 @@
 static struct {
 	q_entry_t *qe_first;
 	q_entry_t **qe_last;
-} sigqueue = { NULL, &sigqueue.qe_first };
+} sigq = { NULL, &sigq.qe_first };
 #define SIGQUEUE_INIT(p)  do {\
 	(p)->qe_first = NULL;\
 	(p)->qe_last = &((p)->qe_first);\
@@ -104,7 +104,7 @@
 }
 
 /*
- * Attempt to post a signal to the sigqueue.
+ * Attempt to post a signal to the sigq.
  */
 static void
 sig_post(int signo)
@@ -116,13 +116,13 @@
 
 	e = alloc_entry(signo);
 	if (e != NULL) {
-		*sigqueue.qe_last = e;
-		sigqueue.qe_last = &e->qe_next;
+		*sigq.qe_last = e;
+		sigq.qe_last = &e->qe_next;
 	}
 }
 
 /*
- * Check the sigqueue for any pending signals.  If any are found,
+ * Check the sigq for any pending signals.  If any are found,
  * preform the required actions and remove them from the queue.
  */
 PUBLIC void
@@ -137,16 +137,16 @@
 	(void)sigfillset(&nset);
 	(void)sigprocmask(SIG_SETMASK, &nset, &oset);
 
-	while ((e = sigqueue.qe_first) != NULL) {
+	while ((e = sigq.qe_first) != NULL) {
 		signo = e->qe_signo;
 		handler = e->qe_handler;
 
 		/*
 		 * Remove the entry from the queue and free it.
 		 */
-		sigqueue.qe_first = e->qe_next;
-		if (sigqueue.qe_first == NULL)
-			sigqueue.qe_last = &sigqueue.qe_first;
+		sigq.qe_first = e->qe_next;
+		if (sigq.qe_first == NULL)
+			sigq.qe_last = &sigq.qe_first;
 		free_entry(e);
 
 		if (handler == SIG_DFL || handler == SIG_IGN) {
@@ -323,7 +323,7 @@
 	 * XXX: This should be unnecessary.
 	 */
 	(void)memset(sigarray, 0, sizeof(sigarray));
-	SIGQUEUE_INIT(&sigqueue);
+	SIGQUEUE_INIT(&sigq);
 
 	/* Restore the signal mask. */
 	(void)sigprocmask(SIG_SETMASK, &oset, NULL);