aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuncaen <mail@duncano.de>2017-05-19 18:57:03 +0200
committerDuncaen <mail@duncano.de>2017-05-19 18:57:03 +0200
commitadaa8fd4509b483ac003a06a3307d8888419a37a (patch)
tree39610903175476b5c0903c6b1ce06eb6b8696aa1
parent84f48a348625cb396b68b70226d50c89b43d7036 (diff)
downloadlobase-adaa8fd4509b483ac003a06a3307d8888419a37a.tar.gz
usr.bin/env: update to OPENBSD_6_1
-rw-r--r--usr.bin/env/env.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/usr.bin/env/env.c b/usr.bin/env/env.c
index 87e9a0b..08aaa75 100644
--- a/usr.bin/env/env.c
+++ b/usr.bin/env/env.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: env.c,v 1.16 2015/10/10 21:19:14 deraadt Exp $ */
+/* $OpenBSD: env.c,v 1.17 2016/10/28 07:22:59 schwarze Exp $ */
/*
* Copyright (c) 1988, 1993, 1994
@@ -31,13 +31,12 @@
#include <err.h>
#include <errno.h>
-#include <locale.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-__dead void usage(void);
+static void __dead usage(void);
int
main(int argc, char *argv[])
@@ -47,8 +46,6 @@ main(int argc, char *argv[])
char **ep, *p;
int ch;
- setlocale(LC_ALL, "");
-
if (pledge("stdio exec", NULL) == -1)
err(1, "pledge");
@@ -86,10 +83,10 @@ main(int argc, char *argv[])
for (ep = environ; *ep; ep++)
(void)printf("%s\n", *ep);
- exit(0);
+ return 0;
}
-void
+static void __dead
usage(void)
{
extern char *__progname;