summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--usr.sbin/apmd/apmd.c2
-rw-r--r--usr.sbin/map-mbone/mapper.c4
-rw-r--r--usr.sbin/mrinfo/mrinfo.c4
-rw-r--r--usr.sbin/mrouted/main.c4
-rw-r--r--usr.sbin/mtrace/mtrace.c10
-rw-r--r--usr.sbin/pppd/main.c6
-rw-r--r--usr.sbin/pppoe/common.c4
-rw-r--r--usr.sbin/rip6query/rip6query.c4
-rw-r--r--usr.sbin/route6d/route6d.c10
9 files changed, 24 insertions, 24 deletions
diff --git a/usr.sbin/apmd/apmd.c b/usr.sbin/apmd/apmd.c
index 4408e316617..55aa461ba02 100644
--- a/usr.sbin/apmd/apmd.c
+++ b/usr.sbin/apmd/apmd.c
@@ -498,7 +498,7 @@ do_etc_file(const char *file)
case 0:
/* We are the child. */
execl(file, prog, NULL);
- _exit(-1);
+ _exit(1);
/* NOTREACHED */
default:
/* We are the parent. */
diff --git a/usr.sbin/map-mbone/mapper.c b/usr.sbin/map-mbone/mapper.c
index 43134c69671..f99c70fb60d 100644
--- a/usr.sbin/map-mbone/mapper.c
+++ b/usr.sbin/map-mbone/mapper.c
@@ -199,7 +199,7 @@ log(severity, syserr, format, va_alist)
}
if (severity <= LOG_ERR)
- exit(-1);
+ exit(1);
}
@@ -917,7 +917,7 @@ int main(argc, argv)
|| connect(udp, (struct sockaddr *) &addr, sizeof(addr)) < 0
|| getsockname(udp, (struct sockaddr *) &addr, &addrlen) < 0) {
perror("Determining local address");
- exit(-1);
+ exit(1);
}
close(udp);
our_addr = addr.sin_addr.s_addr;
diff --git a/usr.sbin/mrinfo/mrinfo.c b/usr.sbin/mrinfo/mrinfo.c
index a81bad1e77c..1e9fe79e6fb 100644
--- a/usr.sbin/mrinfo/mrinfo.c
+++ b/usr.sbin/mrinfo/mrinfo.c
@@ -172,7 +172,7 @@ log(severity, syserr, format, va_alist)
}
if (severity <= LOG_ERR)
- exit(-1);
+ exit(1);
}
/*
@@ -415,7 +415,7 @@ main(argc, argv)
|| connect(udp, (struct sockaddr *) & addr, sizeof(addr)) < 0
|| getsockname(udp, (struct sockaddr *) & addr, &addrlen) < 0) {
perror("Determining local address");
- exit(-1);
+ exit(1);
}
close(udp);
our_addr = addr.sin_addr.s_addr;
diff --git a/usr.sbin/mrouted/main.c b/usr.sbin/mrouted/main.c
index 8e3bd4b1cc7..eb4d5467dfe 100644
--- a/usr.sbin/mrouted/main.c
+++ b/usr.sbin/mrouted/main.c
@@ -33,7 +33,7 @@
#ifndef lint
static char rcsid[] =
- "@(#) $Id: main.c,v 1.4 1996/09/11 19:15:33 deraadt Exp $";
+ "@(#) $Id: main.c,v 1.5 2001/03/09 03:24:07 deraadt Exp $";
#endif
extern char *configfilename;
@@ -727,7 +727,7 @@ log(severity, syserr, format, va_alist)
syslog(severity, "%s", msg);
}
- if (severity <= LOG_ERR) exit(-1);
+ if (severity <= LOG_ERR) exit(1);
}
}
diff --git a/usr.sbin/mtrace/mtrace.c b/usr.sbin/mtrace/mtrace.c
index 0bf2126d04c..c7ef9dd5e20 100644
--- a/usr.sbin/mtrace/mtrace.c
+++ b/usr.sbin/mtrace/mtrace.c
@@ -52,7 +52,7 @@
#ifndef lint
static char rcsid[] =
- "@(#) $Id: mtrace.c,v 1.4 2000/12/21 00:33:38 deraadt Exp $";
+ "@(#) $Id: mtrace.c,v 1.5 2001/03/09 03:24:07 deraadt Exp $";
#endif
#include <netdb.h>
@@ -1328,7 +1328,7 @@ Usage: mtrace [-Mlnps] [-w wait] [-m max_hops] [-q nqueries] [-g gateway]\n\
(connect(udp, (struct sockaddr *) &addr, sizeof(addr)) < 0) ||
getsockname(udp, (struct sockaddr *) &addr, &addrlen) < 0) {
perror("Determining local address");
- exit(-1);
+ exit(1);
}
#ifdef SUNOS5
@@ -1347,14 +1347,14 @@ Usage: mtrace [-Mlnps] [-w wait] [-m max_hops] [-q nqueries] [-g gateway]\n\
error = sysinfo(SI_HOSTNAME, myhostname, sizeof(myhostname));
if (error == -1) {
perror("Getting my hostname");
- exit(-1);
+ exit(1);
}
hp = gethostbyname(myhostname);
if (hp == NULL || hp->h_addrtype != AF_INET ||
hp->h_length != sizeof(addr.sin_addr)) {
perror("Finding IP address for my hostname");
- exit(-1);
+ exit(1);
}
memcpy((char *)&addr.sin_addr.s_addr, hp->h_addr, hp->h_length);
@@ -1715,7 +1715,7 @@ log(severity, syserr, format, va_alist)
else
fprintf(stderr, ": errno %d\n", syserr);
}
- if (severity <= LOG_ERR) exit(-1);
+ if (severity <= LOG_ERR) exit(1);
}
/* dummies */
diff --git a/usr.sbin/pppd/main.c b/usr.sbin/pppd/main.c
index 323de618f0c..a56b047601c 100644
--- a/usr.sbin/pppd/main.c
+++ b/usr.sbin/pppd/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.29 2000/09/15 07:13:51 deraadt Exp $ */
+/* $OpenBSD: main.c,v 1.30 2001/03/09 03:24:09 deraadt Exp $ */
/*
* main.c - Point-to-Point Protocol main module
@@ -23,7 +23,7 @@
#if 0
static char rcsid[] = "Id: main.c,v 1.49 1998/05/05 05:24:17 paulus Exp $";
#else
-static char rcsid[] = "$OpenBSD: main.c,v 1.29 2000/09/15 07:13:51 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.30 2001/03/09 03:24:09 deraadt Exp $";
#endif
#endif
@@ -1188,7 +1188,7 @@ run_program(prog, args, must_exist)
execve(prog, args, script_env);
if (must_exist || errno != ENOENT)
syslog(LOG_WARNING, "Can't execute %s: %m", prog);
- _exit(-1);
+ _exit(1);
}
MAINDEBUG((LOG_DEBUG, "Script %s started; pid = %d", prog, pid));
++n_children;
diff --git a/usr.sbin/pppoe/common.c b/usr.sbin/pppoe/common.c
index cb29c891d88..9070effeb77 100644
--- a/usr.sbin/pppoe/common.c
+++ b/usr.sbin/pppoe/common.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: common.c,v 1.2 2000/10/09 22:52:18 brian Exp $ */
+/* $OpenBSD: common.c,v 1.3 2001/03/09 03:24:09 deraadt Exp $ */
/*
* Copyright (c) 2000 Network Security Technologies, Inc. http://www.netsec.net
@@ -119,7 +119,7 @@ runppp(bpffd, sysname)
execlp(PPP_PROG, "ppp", "-direct", sysname, NULL);
perror("execlp");
syslog(LOG_INFO, "%s exec failed: %m", PPP_PROG);
- _exit(-1);
+ _exit(1);
}
int
diff --git a/usr.sbin/rip6query/rip6query.c b/usr.sbin/rip6query/rip6query.c
index 9859528549c..4d827d3ffda 100644
--- a/usr.sbin/rip6query/rip6query.c
+++ b/usr.sbin/rip6query/rip6query.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rip6query.c,v 1.1 2000/01/19 08:13:01 itojun Exp $ */
+/* $OpenBSD: rip6query.c,v 1.2 2001/03/09 03:24:10 deraadt Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -104,7 +104,7 @@ main(argc, argv)
if (argc != 1) {
usage();
- exit(-1);
+ exit(1);
}
if ((s = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
diff --git a/usr.sbin/route6d/route6d.c b/usr.sbin/route6d/route6d.c
index cb17b634e2f..d6aae072c6b 100644
--- a/usr.sbin/route6d/route6d.c
+++ b/usr.sbin/route6d/route6d.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: route6d.c,v 1.16 2001/03/08 03:24:57 itojun Exp $ */
+/* $OpenBSD: route6d.c,v 1.17 2001/03/09 03:24:10 deraadt Exp $ */
/* $KAME: route6d.c,v 1.60 2001/03/08 02:15:42 onoe Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#if 0
-static char _rcsid[] = "$OpenBSD: route6d.c,v 1.16 2001/03/08 03:24:57 itojun Exp $";
+static char _rcsid[] = "$OpenBSD: route6d.c,v 1.17 2001/03/09 03:24:10 deraadt Exp $";
#endif
#include <stdio.h>
@@ -1531,7 +1531,7 @@ rtrecv()
if ((len = read(rtsock, buf, sizeof(buf))) < 0) {
perror("read from rtsock");
- exit(-1);
+ exit(1);
}
if (len < sizeof(*rtm)) {
trace(1, "short read from rtsock: %d (should be > %lu)\n",
@@ -2760,12 +2760,12 @@ getroute(np, gw)
if (errno == ESRCH) /* No such route found */
return NULL;
perror("write to rtsock");
- exit(-1);
+ exit(1);
}
do {
if ((len = read(rtsock, buf, sizeof(buf))) < 0) {
perror("read from rtsock");
- exit(-1);
+ exit(1);
}
rtm = (struct rt_msghdr *)buf;
} while (rtm->rtm_seq != myseq || rtm->rtm_pid != pid);