summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bin/ed/main.c8
-rw-r--r--libexec/comsat/comsat.c6
-rw-r--r--libexec/ftpd/ftpd.c6
-rw-r--r--libexec/identd/identd.c4
-rw-r--r--sbin/mountd/mountd.c6
-rw-r--r--sbin/photurisd/config.c6
-rw-r--r--sbin/photurisd/server.c6
-rw-r--r--sbin/ping6/ping6.c10
-rw-r--r--usr.sbin/pppoe/client.c4
9 files changed, 27 insertions, 29 deletions
diff --git a/bin/ed/main.c b/bin/ed/main.c
index 4c14d3e89c0..da57782a7b0 100644
--- a/bin/ed/main.c
+++ b/bin/ed/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.23 2001/11/11 07:36:40 deraadt Exp $ */
+/* $OpenBSD: main.c,v 1.24 2001/11/17 19:54:56 deraadt Exp $ */
/* $NetBSD: main.c,v 1.3 1995/03/21 09:04:44 cgd Exp $ */
/* main.c: This file contains the main control and user-interface routines
@@ -39,7 +39,7 @@ char *copyright =
#if 0
static char *rcsid = "@(#)main.c,v 1.1 1994/02/01 00:34:42 alm Exp";
#else
-static char rcsid[] = "$OpenBSD: main.c,v 1.23 2001/11/11 07:36:40 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.24 2001/11/17 19:54:56 deraadt Exp $";
#endif
#endif /* not lint */
@@ -485,8 +485,8 @@ next_addr()
int patlock = 0; /* if set, pattern not freed by get_compiled_pattern() */
-sig_atomic_t rows = 22; /* scroll length: ws_row - 2 */
-sig_atomic_t cols = 72; /* wrap column */
+volatile sig_atomic_t rows = 22; /* scroll length: ws_row - 2 */
+volatile sig_atomic_t cols = 72; /* wrap column */
/* exec_command: execute the next command in command buffer; return print
request, if any */
diff --git a/libexec/comsat/comsat.c b/libexec/comsat/comsat.c
index e18725c91c9..ad73b46a239 100644
--- a/libexec/comsat/comsat.c
+++ b/libexec/comsat/comsat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: comsat.c,v 1.17 2001/07/08 21:18:06 deraadt Exp $ */
+/* $OpenBSD: comsat.c,v 1.18 2001/11/17 19:54:56 deraadt Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -41,7 +41,7 @@ static char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)comsat.c 8.1 (Berkeley) 6/4/93";*/
-static char rcsid[] = "$OpenBSD: comsat.c,v 1.17 2001/07/08 21:18:06 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: comsat.c,v 1.18 2001/11/17 19:54:56 deraadt Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -84,7 +84,7 @@ void readutmp __P((int));
void doreadutmp __P((void));
void reapchildren __P((int));
-sig_atomic_t wantreadutmp;
+volatile sig_atomic_t wantreadutmp;
int
main(argc, argv)
diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c
index b035ad50078..9837313aeb9 100644
--- a/libexec/ftpd/ftpd.c
+++ b/libexec/ftpd/ftpd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ftpd.c,v 1.106 2001/11/05 09:51:13 deraadt Exp $ */
+/* $OpenBSD: ftpd.c,v 1.107 2001/11/17 19:54:56 deraadt Exp $ */
/* $NetBSD: ftpd.c,v 1.15 1995/06/03 22:46:47 mycroft Exp $ */
/*
@@ -73,7 +73,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)ftpd.c 8.4 (Berkeley) 4/16/94";
#else
-static char rcsid[] = "$OpenBSD: ftpd.c,v 1.106 2001/11/05 09:51:13 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ftpd.c,v 1.107 2001/11/17 19:54:56 deraadt Exp $";
#endif
#endif /* not lint */
@@ -172,7 +172,7 @@ int doutmp = 0; /* update utmp file */
int usedefault = 1; /* for data transfers */
int pdata = -1; /* for passive mode */
int family = AF_INET;
-sig_atomic_t transflag;
+volatile sig_atomic_t transflag;
off_t file_size;
off_t byte_count;
#if !defined(CMASK) || CMASK == 0
diff --git a/libexec/identd/identd.c b/libexec/identd/identd.c
index dadf2fefde2..86561f9bc0f 100644
--- a/libexec/identd/identd.c
+++ b/libexec/identd/identd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: identd.c,v 1.21 2001/09/19 10:58:07 mpech Exp $ */
+/* $OpenBSD: identd.c,v 1.22 2001/11/17 19:54:56 deraadt Exp $ */
/*
* This program is in the public domain and may be used freely by anyone
@@ -134,7 +134,7 @@ gethost6(addr)
return(hbuf[bb]);
}
-sig_atomic_t alarm_fired;
+volatile sig_atomic_t alarm_fired;
/*
* Exit cleanly after our time's up.
diff --git a/sbin/mountd/mountd.c b/sbin/mountd/mountd.c
index ef90fcbd72b..e6e5b2075b2 100644
--- a/sbin/mountd/mountd.c
+++ b/sbin/mountd/mountd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mountd.c,v 1.39 2001/11/05 07:39:16 mpech Exp $ */
+/* $OpenBSD: mountd.c,v 1.40 2001/11/17 19:54:57 deraadt Exp $ */
/* $NetBSD: mountd.c,v 1.31 1996/02/18 11:57:53 fvdl Exp $ */
/*
@@ -216,8 +216,8 @@ int opt_flags;
int debug = 0;
-sig_atomic_t gothup;
-sig_atomic_t gotterm;
+volatile sig_atomic_t gothup;
+volatile sig_atomic_t gotterm;
/*
* Mountd server for NFS mount protocol as described in:
diff --git a/sbin/photurisd/config.c b/sbin/photurisd/config.c
index 6c301e5fee4..b2bf7a950a1 100644
--- a/sbin/photurisd/config.c
+++ b/sbin/photurisd/config.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: config.c,v 1.7 2001/01/28 22:45:07 niklas Exp $ */
+/* $OpenBSD: config.c,v 1.8 2001/11/17 19:54:57 deraadt Exp $ */
/*
* Copyright 1997-2000 Niels Provos <provos@citi.umich.edu>
@@ -35,7 +35,7 @@
*/
#ifndef lint
-static char rcsid[] = "$OpenBSD: config.c,v 1.7 2001/01/28 22:45:07 niklas Exp $";
+static char rcsid[] = "$OpenBSD: config.c,v 1.8 2001/11/17 19:54:57 deraadt Exp $";
#endif
#define _CONFIG_C_
@@ -749,7 +749,7 @@ reconfig(int sig)
init_identities(NULL, NULL);
}
-sig_atomic_t wantconfig;
+volatile sig_atomic_t wantconfig;
void
sigconfig(int sig)
diff --git a/sbin/photurisd/server.c b/sbin/photurisd/server.c
index 2b9320d13b8..0c8c8dad523 100644
--- a/sbin/photurisd/server.c
+++ b/sbin/photurisd/server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: server.c,v 1.9 2001/01/28 22:45:17 niklas Exp $ */
+/* $OpenBSD: server.c,v 1.10 2001/11/17 19:54:57 deraadt Exp $ */
/*
* Copyright 1997-2000 Niels Provos <provos@citi.umich.edu>
@@ -37,7 +37,7 @@
*/
#ifndef lint
-static char rcsid[] = "$OpenBSD: server.c,v 1.9 2001/01/28 22:45:17 niklas Exp $";
+static char rcsid[] = "$OpenBSD: server.c,v 1.10 2001/11/17 19:54:57 deraadt Exp $";
#endif
#define _SERVER_C_
@@ -275,7 +275,7 @@ server(void)
FD_SET(sockets[i], normfds);
while (1) {
- extern sig_atomic_t wantconfig;
+ extern volatile sig_atomic_t wantconfig;
if (wantconfig) {
reconfig(0);
diff --git a/sbin/ping6/ping6.c b/sbin/ping6/ping6.c
index a0a828c9be2..405c2d9672f 100644
--- a/sbin/ping6/ping6.c
+++ b/sbin/ping6/ping6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ping6.c,v 1.38 2001/11/05 07:54:44 itojun Exp $ */
+/* $OpenBSD: ping6.c,v 1.39 2001/11/17 19:54:57 deraadt Exp $ */
/* $KAME: ping6.c,v 1.129 2001/06/22 13:16:02 itojun Exp $ */
/*
@@ -247,7 +247,6 @@ struct msghdr smsghdr;
struct iovec smsgiov;
char *scmsg = 0;
-volatile int signo;
volatile sig_atomic_t seenalrm;
volatile sig_atomic_t seenint;
#ifdef SIGINFO
@@ -999,7 +998,7 @@ main(argc, argv)
if ((fdmaskp = malloc(fdmasks)) == NULL)
err(1, "malloc");
- signo = seenalrm = seenint = 0;
+ seenalrm = seenint = 0;
#ifdef SIGINFO
seeninfo = 0;
#endif
@@ -1097,10 +1096,9 @@ main(argc, argv)
void
onsignal(sig)
- int sig;
+ int signo;
{
- signo = sig;
- switch (sig) {
+ switch (signo) {
case SIGALRM:
seenalrm++;
break;
diff --git a/usr.sbin/pppoe/client.c b/usr.sbin/pppoe/client.c
index c30d0c3cf3b..30167f802f1 100644
--- a/usr.sbin/pppoe/client.c
+++ b/usr.sbin/pppoe/client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: client.c,v 1.11 2001/04/24 05:09:23 jason Exp $ */
+/* $OpenBSD: client.c,v 1.12 2001/11/17 19:54:57 deraadt Exp $ */
/*
* Copyright (c) 2000 Network Security Technologies, Inc. http://www.netsec.net
@@ -536,7 +536,7 @@ recv_padt(bfd, myea, rmea, eh, ph, len, pkt)
return (0);
}
-sig_atomic_t timer_alarm;
+volatile sig_atomic_t timer_alarm;
static struct sigaction timer_oact;
void
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 03:39:54 +0000