summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorXavier Santolaria <xsa@cvs.openbsd.org>2006-05-08 09:48:13 +0000
committerXavier Santolaria <xsa@cvs.openbsd.org>2006-05-08 09:48:13 +0000
commitdd28ef8a71d1e784b07abb66ed629e05e1bc5334 (patch)
tree4d8cc26673604d23b789be9f8344ee3c467233f1 /usr.bin
parent0d5abc6820fbd514ec00c8e0666b860ade5aed3a (diff)
exit with status 2 after usage() too; pointed out by uwe@.
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/rcs/rcsdiff.c8
-rw-r--r--usr.bin/rcs/rcsmerge.c10
2 files changed, 9 insertions, 9 deletions
diff --git a/usr.bin/rcs/rcsdiff.c b/usr.bin/rcs/rcsdiff.c
index 389080a6c81..e1ea2b0c338 100644
--- a/usr.bin/rcs/rcsdiff.c
+++ b/usr.bin/rcs/rcsdiff.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rcsdiff.c,v 1.61 2006/05/05 15:47:36 xsa Exp $ */
+/* $OpenBSD: rcsdiff.c,v 1.62 2006/05/08 09:48:12 xsa Exp $ */
/*
* Copyright (c) 2005 Joris Vink <joris@openbsd.org>
* All rights reserved.
@@ -63,7 +63,7 @@ rcsdiff_main(int argc, char **argv)
if (RCS_KWEXP_INVAL(kflag)) {
warnx("invalid RCS keyword substitution mode");
(usage)();
- exit(1);
+ exit(D_ERROR);
}
break;
case 'n':
@@ -102,7 +102,7 @@ rcsdiff_main(int argc, char **argv)
break;
default:
(usage)();
- exit (1);
+ exit (D_ERROR);
}
}
@@ -112,7 +112,7 @@ rcsdiff_main(int argc, char **argv)
if (argc == 0) {
warnx("no input file");
(usage)();
- exit(1);
+ exit(D_ERROR);
}
for (i = 0; i < argc; i++) {
diff --git a/usr.bin/rcs/rcsmerge.c b/usr.bin/rcs/rcsmerge.c
index e4eadf8167b..f2bc54ae029 100644
--- a/usr.bin/rcs/rcsmerge.c
+++ b/usr.bin/rcs/rcsmerge.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rcsmerge.c,v 1.37 2006/04/26 21:55:22 joris Exp $ */
+/* $OpenBSD: rcsmerge.c,v 1.38 2006/05/08 09:48:12 xsa Exp $ */
/*
* Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org>
* All rights reserved.
@@ -52,7 +52,7 @@ rcsmerge_main(int argc, char **argv)
if (RCS_KWEXP_INVAL(kflag)) {
warnx("invalid RCS keyword substitution mode");
(usage)();
- exit(1);
+ exit(D_ERROR);
}
break;
case 'p':
@@ -85,7 +85,7 @@ rcsmerge_main(int argc, char **argv)
break;
default:
(usage)();
- exit(1);
+ exit(D_ERROR);
}
}
@@ -95,13 +95,13 @@ rcsmerge_main(int argc, char **argv)
if (argc < 0) {
warnx("no input file");
(usage)();
- exit(1);
+ exit(D_ERROR);
}
if (rev_str1 == NULL) {
warnx("no base revision number given");
(usage)();
- exit(1);
+ exit(D_ERROR);
}
for (i = 0; i < argc; i++) {