summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2011-04-27 17:58:44 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2011-04-27 17:58:44 +0000
commit93b199783c37be11418c080af5cdcd2ff000a368 (patch)
treeceb4c055146e4cbe24b23b29c2e551b1b7b7a260 /usr.bin
parent19a98c312c073dfe9d79f5639ecc523fbd532b8a (diff)
use more volatile sig_atomic_t in signal handlers
ok ratchov
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/aucat/aucat.c6
-rw-r--r--usr.bin/aucat/conf.h4
-rw-r--r--usr.bin/aucat/listen.c3
-rw-r--r--usr.bin/aucat/pipe.c1
4 files changed, 8 insertions, 6 deletions
diff --git a/usr.bin/aucat/aucat.c b/usr.bin/aucat/aucat.c
index bc2a57dc0bc..c03d41611fe 100644
--- a/usr.bin/aucat/aucat.c
+++ b/usr.bin/aucat/aucat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aucat.c,v 1.110 2011/04/19 00:02:28 ratchov Exp $ */
+/* $OpenBSD: aucat.c,v 1.111 2011/04/27 17:58:43 deraadt Exp $ */
/*
* Copyright (c) 2008 Alexandre Ratchov <alex@caoua.org>
*
@@ -65,9 +65,9 @@
#endif
#ifdef DEBUG
-int debug_level = 0;
+volatile sig_atomic_t debug_level = 0;
#endif
-volatile int quit_flag = 0;
+volatile sig_atomic_t quit_flag = 0;
/*
* SIGINT handler, it raises the quit flag. If the flag is already set,
diff --git a/usr.bin/aucat/conf.h b/usr.bin/aucat/conf.h
index 8d2efae9cde..3d70a2b8de9 100644
--- a/usr.bin/aucat/conf.h
+++ b/usr.bin/aucat/conf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.h,v 1.19 2011/04/18 23:59:15 ratchov Exp $ */
+/* $OpenBSD: conf.h,v 1.20 2011/04/27 17:58:43 deraadt Exp $ */
/*
* Copyright (c) 2008 Alexandre Ratchov <alex@caoua.org>
*
@@ -27,7 +27,7 @@
* 3 - structural changes (new aproc structures and files stream params changes)
* 4 - data blocks and messages
*/
-extern int debug_level;
+extern volatile sig_atomic_t debug_level;
#endif
/*
diff --git a/usr.bin/aucat/listen.c b/usr.bin/aucat/listen.c
index 6939a0b8829..35b316b30ac 100644
--- a/usr.bin/aucat/listen.c
+++ b/usr.bin/aucat/listen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: listen.c,v 1.12 2011/04/19 00:02:29 ratchov Exp $ */
+/* $OpenBSD: listen.c,v 1.13 2011/04/27 17:58:43 deraadt Exp $ */
/*
* Copyright (c) 2008 Alexandre Ratchov <alex@caoua.org>
*
@@ -16,6 +16,7 @@
*/
#include <sys/types.h>
#include <sys/socket.h>
+#include <sys/signal.h>
#include <sys/stat.h>
#include <sys/un.h>
#include <err.h>
diff --git a/usr.bin/aucat/pipe.c b/usr.bin/aucat/pipe.c
index 065f6f0ad7a..83900920095 100644
--- a/usr.bin/aucat/pipe.c
+++ b/usr.bin/aucat/pipe.c
@@ -16,6 +16,7 @@
#include <sys/time.h>
#include <sys/types.h>
+#include <sys/signal.h>
#include <err.h>
#include <errno.h>