aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuncaen <mail@duncano.de>2017-05-19 18:47:54 +0200
committerDuncaen <mail@duncano.de>2017-05-19 18:47:54 +0200
commit58964fc0db90ff29717abc82e4586d8cd633f3d8 (patch)
tree1493379754acae9f7c21fbdeff6a34c05ea274a4
parent7ade504750ecb0ec717f035eb91ec5576ec22f83 (diff)
downloadlobase-58964fc0db90ff29717abc82e4586d8cd633f3d8.tar.gz
usr.bin/nice: update to OPENBSD_6_1
-rw-r--r--usr.bin/nice/nice.c18
1 files changed, 7 insertions, 11 deletions
diff --git a/usr.bin/nice/nice.c b/usr.bin/nice/nice.c
index d48e067..bef3caa 100644
--- a/usr.bin/nice/nice.c
+++ b/usr.bin/nice/nice.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nice.c,v 1.15 2015/10/19 18:53:35 deraadt Exp $ */
+/* $OpenBSD: nice.c,v 1.17 2016/10/28 07:22:59 schwarze Exp $ */
/* $NetBSD: nice.c,v 1.9 1995/08/31 23:30:58 jtc Exp $ */
/*
@@ -31,18 +31,17 @@
*/
#include <sys/resource.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <locale.h>
+
#include <ctype.h>
-#include <errno.h>
#include <err.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
#include <unistd.h>
#define DEFNICE 10
-int main(int, char **);
-static void usage(void);
+static void __dead usage(void);
int
main(int argc, char *argv[])
@@ -51,8 +50,6 @@ main(int argc, char *argv[])
int prio = DEFNICE;
int c;
- setlocale(LC_ALL, "");
-
if (pledge("stdio exec proc", NULL) == -1)
err(1, "pledge");
@@ -75,7 +72,6 @@ main(int argc, char *argv[])
break;
default:
usage();
- break;
}
}
argc -= optind;
@@ -98,7 +94,7 @@ main(int argc, char *argv[])
err((errno == ENOENT) ? 127 : 126, "%s", argv[0]);
}
-static void
+static void __dead
usage(void)
{
extern char *__progname;