summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2001-03-08 21:41:42 +0000
committerderaadt <deraadt@openbsd.org>2001-03-08 21:41:42 +0000
commit4636c83221865f8d10149c27dd83a39533048b4c (patch)
tree04f7441d74242d2f53aff03e7c060aba0ef142ec
parentwhack exit(-#) (diff)
downloadwireguard-openbsd-4636c83221865f8d10149c27dd83a39533048b4c.tar.xz
wireguard-openbsd-4636c83221865f8d10149c27dd83a39533048b4c.zip
whack exit(-#)
-rw-r--r--sbin/ipsecadm/ipsecadm.c4
-rw-r--r--sbin/photurisd/photurisd.c6
-rw-r--r--sbin/routed/rtquery/rtquery.c4
-rw-r--r--sbin/scsi/scsi.c20
-rw-r--r--sbin/startkey/startkey.c14
5 files changed, 24 insertions, 24 deletions
diff --git a/sbin/ipsecadm/ipsecadm.c b/sbin/ipsecadm/ipsecadm.c
index 162ab6ef788..1368783acee 100644
--- a/sbin/ipsecadm/ipsecadm.c
+++ b/sbin/ipsecadm/ipsecadm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ipsecadm.c,v 1.49 2000/11/17 04:10:21 angelos Exp $ */
+/* $OpenBSD: ipsecadm.c,v 1.50 2001/03/08 21:41:42 deraadt Exp $ */
/*
* The authors of this code are John Ioannidis (ji@tla.org),
* Angelos D. Keromytis (kermit@csd.uch.gr) and
@@ -154,7 +154,7 @@ x2i(char *s)
if (!isxdigit(s[0]) || !isxdigit(s[1]))
{
fprintf(stderr, "Keys should be specified in hex digits.\n");
- exit(-1);
+ exit(1);
}
return strtoul(ss, NULL, 16);
diff --git a/sbin/photurisd/photurisd.c b/sbin/photurisd/photurisd.c
index 0aa5141005c..acb145f4538 100644
--- a/sbin/photurisd/photurisd.c
+++ b/sbin/photurisd/photurisd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: photurisd.c,v 1.10 2001/01/28 22:45:15 niklas Exp $ */
+/* $OpenBSD: photurisd.c,v 1.11 2001/03/08 21:41:47 deraadt Exp $ */
/*
* Copyright 1997-2000 Niels Provos <provos@citi.umich.edu>
@@ -34,7 +34,7 @@
*/
#ifndef lint
-static char rcsid[] = "$OpenBSD: photurisd.c,v 1.10 2001/01/28 22:45:15 niklas Exp $";
+static char rcsid[] = "$OpenBSD: photurisd.c,v 1.11 2001/03/08 21:41:47 deraadt Exp $";
#endif
#define _PHOTURIS_C_
@@ -190,7 +190,7 @@ main(int argc, char **argv)
init_attributes();
if (init_identities(NULL,NULL) == -1)
- exit(-1);
+ exit(1);
init_schedule();
diff --git a/sbin/routed/rtquery/rtquery.c b/sbin/routed/rtquery/rtquery.c
index 253e5eda7f1..89a9a91eff3 100644
--- a/sbin/routed/rtquery/rtquery.c
+++ b/sbin/routed/rtquery/rtquery.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rtquery.c,v 1.9 1998/06/01 07:23:41 deraadt Exp $ */
+/* $OpenBSD: rtquery.c,v 1.10 2001/03/08 21:41:49 deraadt Exp $ */
/*-
* Copyright (c) 1982, 1986, 1993
@@ -317,7 +317,7 @@ query_loop(char *argv[], int argc)
seen = 0;
while (0 > out(*argv++)) {
if (*argv == 0)
- exit(-1);
+ exit(1);
answered++;
}
diff --git a/sbin/scsi/scsi.c b/sbin/scsi/scsi.c
index 94c905c1899..1e22cd9408b 100644
--- a/sbin/scsi/scsi.c
+++ b/sbin/scsi/scsi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scsi.c,v 1.6 2000/01/22 20:25:07 deraadt Exp $ */
+/* $OpenBSD: scsi.c,v 1.7 2001/03/08 21:41:50 deraadt Exp $ */
/* $FreeBSD: scsi.c,v 1.11 1996/04/06 11:00:28 joerg Exp $ */
/*
@@ -482,7 +482,7 @@ void mode_sense(int fd, u_char *data, int len, int pc, int page)
if (SCSIREQ_ERROR(scsireq))
{
scsi_debug(stderr, 0, scsireq);
- exit(-1);
+ exit(1);
}
free(scsireq);
@@ -505,7 +505,7 @@ void mode_select(int fd, u_char *data, int len, int perm)
if (SCSIREQ_ERROR(scsireq))
{
scsi_debug(stderr, 0, scsireq);
- exit(-1);
+ exit(1);
}
free(scsireq);
@@ -569,7 +569,7 @@ static char *mode_lookup(int page)
skipwhite(modes);
if (getc(modes) != START_ENTRY) {
fprintf(stderr, "Expected %c.\n", START_ENTRY);
- exit(-1);
+ exit(1);
}
match = 1;
@@ -670,7 +670,7 @@ edit_check(void *hook, int letter, void *arg, int count, char *name)
{
if (letter != 'i' && letter != 'b') {
fprintf(stderr, "Can't edit format %c.\n", letter);
- exit(-1);
+ exit(1);
}
if (editind >= sizeof(editinfo) / sizeof(editinfo[0])) {
@@ -686,7 +686,7 @@ edit_defaults(void *hook, int letter, void *arg, int count, char *name)
{
if (letter != 'i' && letter != 'b') {
fprintf(stderr, "Can't edit format %c.\n", letter);
- exit(-1);
+ exit(1);
}
editinfo[editind].default_value = ((long)arg);
@@ -699,7 +699,7 @@ edit_report(void *hook, int letter, void *arg, int count, char *name)
if (editinfo[editind].can_edit) {
if (letter != 'i' && letter != 'b') {
fprintf(stderr, "Can't report format %c.\n", letter);
- exit(-1);
+ exit(1);
}
fprintf(edit_file, "%s: %ld\n", name, (long)arg);
@@ -726,7 +726,7 @@ edit_get(void *hook, char *name)
if (strncmp(name, line, strlen(name)) != 0) {
fprintf(stderr, "Expected \"%s\" and read \"%s\"\n",
name, line);
- exit(-1);
+ exit(1);
}
arg = strtoul(line + strlen(name) + 2, 0, 0);
@@ -790,13 +790,13 @@ mode_edit(int fd, int page, int edit, int argc, char *argv[])
if (edit) {
if (!fmt) {
fprintf(stderr, "Sorry: can't edit without a format.\n");
- exit(-1);
+ exit(1);
}
if (pagectl != 0 && pagectl != 3) {
fprintf(stderr,
"It only makes sense to edit page 0 (current) or page 3 (saved values)\n");
- exit(-1);
+ exit(1);
}
verbose = 1;
diff --git a/sbin/startkey/startkey.c b/sbin/startkey/startkey.c
index 0d97100160a..3e311693999 100644
--- a/sbin/startkey/startkey.c
+++ b/sbin/startkey/startkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: startkey.c,v 1.2 2001/01/28 22:45:20 niklas Exp $ */
+/* $OpenBSD: startkey.c,v 1.3 2001/03/08 21:41:51 deraadt Exp $ */
/*
* Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
@@ -33,7 +33,7 @@
*/
#ifndef lint
-static char rcsid[] = "$OpenBSD: startkey.c,v 1.2 2001/01/28 22:45:20 niklas Exp $";
+static char rcsid[] = "$OpenBSD: startkey.c,v 1.3 2001/03/08 21:41:51 deraadt Exp $";
#endif
#include <stdio.h>
@@ -85,14 +85,14 @@ main(int argc, char **argv)
for (len=0, i=0; i<argc; i++) {
if (strchr(argv[i], '=') == NULL) {
fprintf(stderr, "missing = in %s\n", argv[i]);
- exit(-1);
+ exit(1);
}
len += strlen(argv[i])+1;
}
if (chdir(dir) == -1) {
fprintf(stderr, "Can't change dir to %s\n", dir);
- exit(-1);
+ exit(1);
}
fd = open(PHOTURIS_FIFO, O_WRONLY | O_NONBLOCK, 0);
@@ -100,12 +100,12 @@ main(int argc, char **argv)
if (fd == -1)
{
perror("open()");
- exit(-1);
+ exit(1);
}
if ((buffer = calloc(len, sizeof(char))) == NULL) {
perror("calloc()");
- exit(-1);
+ exit(1);
}
for (i=0; i<argc; i++) {
@@ -116,7 +116,7 @@ main(int argc, char **argv)
if (write(fd, buffer, strlen(buffer)) != strlen(buffer))
{
perror("write()");
- exit(-1);
+ exit(1);
}
free(buffer);