aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuncaen <mail@duncano.de>2017-05-19 19:00:47 +0200
committerDuncaen <mail@duncano.de>2017-05-19 19:00:47 +0200
commit6a0767c4ef63d3efa6e106c774b29b9d31666eda (patch)
tree8c226170972f13408ae3beb923bfb50fb00ca251
parentbfa0041a402c78a0e08a8799cb31ebf5a0b4fee6 (diff)
downloadlobase-6a0767c4ef63d3efa6e106c774b29b9d31666eda.tar.gz
usr.bin/cmp: update to OPENBSD_6_1
-rw-r--r--usr.bin/cmp/cmp.c24
1 files changed, 10 insertions, 14 deletions
diff --git a/usr.bin/cmp/cmp.c b/usr.bin/cmp/cmp.c
index 82a9c4b..ec95882 100644
--- a/usr.bin/cmp/cmp.c
+++ b/usr.bin/cmp/cmp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmp.c,v 1.14 2015/12/29 19:04:46 gsoares Exp $ */
+/* $OpenBSD: cmp.c,v 1.16 2016/10/28 07:22:59 schwarze Exp $ */
/* $NetBSD: cmp.c,v 1.7 1995/09/08 03:22:56 tls Exp $ */
/*
@@ -39,13 +39,12 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include <locale.h>
#include "extern.h"
int lflag, sflag;
-static void usage(void);
+static void __dead usage(void);
int
main(int argc, char *argv[])
@@ -55,8 +54,6 @@ main(int argc, char *argv[])
int ch, fd1, fd2, special;
char *file1, *file2;
- setlocale(LC_ALL, "");
-
if (pledge("stdio rpath", NULL) == -1)
err(ERR_EXIT, "pledge");
@@ -68,7 +65,6 @@ main(int argc, char *argv[])
case 's': /* silent run */
sflag = 1;
break;
- case '?':
default:
usage();
}
@@ -90,14 +86,14 @@ main(int argc, char *argv[])
file1 = "stdin";
} else if ((fd1 = open(file1, O_RDONLY, 0)) < 0) {
if (sflag)
- exit(ERR_EXIT);
+ return ERR_EXIT;
else
err(ERR_EXIT, "%s", file1);
}
if (strcmp(file2 = argv[1], "-") == 0) {
if (special) {
if (sflag)
- exit(ERR_EXIT);
+ return ERR_EXIT;
else
errx(ERR_EXIT,
"standard input may only be specified once");
@@ -107,7 +103,7 @@ main(int argc, char *argv[])
file2 = "stdin";
} else if ((fd2 = open(file2, O_RDONLY, 0)) < 0) {
if (sflag)
- exit(ERR_EXIT);
+ return ERR_EXIT;
else
err(ERR_EXIT, "%s", file2);
}
@@ -115,13 +111,13 @@ main(int argc, char *argv[])
if (pledge("stdio", NULL) == -1)
err(ERR_EXIT, "pledge");
- skip1 = argc > 2 ? strtoq(argv[2], NULL, 0) : 0;
- skip2 = argc == 4 ? strtoq(argv[3], NULL, 0) : 0;
+ skip1 = argc > 2 ? strtoll(argv[2], NULL, 0) : 0;
+ skip2 = argc == 4 ? strtoll(argv[3], NULL, 0) : 0;
if (!special) {
if (fstat(fd1, &sb1)) {
if (sflag)
- exit(ERR_EXIT);
+ return ERR_EXIT;
else
err(ERR_EXIT, "%s", file1);
}
@@ -130,7 +126,7 @@ main(int argc, char *argv[])
else {
if (fstat(fd2, &sb2)) {
if (sflag)
- exit(ERR_EXIT);
+ return ERR_EXIT;
else
err(ERR_EXIT, "%s", file2);
}
@@ -147,7 +143,7 @@ main(int argc, char *argv[])
return 0;
}
-static void
+static void __dead
usage(void)
{