aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuncaen <mail@duncano.de>2017-05-24 03:04:42 +0200
committerDuncaen <mail@duncano.de>2017-05-24 03:20:11 +0200
commit6142aa55810a8a85f17727fa1f6ff9f814c5f728 (patch)
treee4ee0336c80e19e8ad4dfd1384ddbe57ebe565f6
parent2cf1ee65c7e82c61d0a304ecf848d16bd242084a (diff)
downloadlobase-6142aa55810a8a85f17727fa1f6ff9f814c5f728.tar.gz
bin/mkdir: update to OPENBSD_6_1
-rw-r--r--bin/mkdir/mkdir.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/bin/mkdir/mkdir.c b/bin/mkdir/mkdir.c
index 1943882..1f94d0a 100644
--- a/bin/mkdir/mkdir.c
+++ b/bin/mkdir/mkdir.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mkdir.c,v 1.29 2015/10/23 01:00:16 deraadt Exp $ */
+/* $OpenBSD: mkdir.c,v 1.30 2016/10/19 18:20:25 schwarze Exp $ */
/* $NetBSD: mkdir.c,v 1.14 1995/06/25 21:59:21 mycroft Exp $ */
/*
@@ -35,7 +35,6 @@
#include <err.h>
#include <errno.h>
-#include <locale.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -44,7 +43,7 @@
extern char *__progname;
int mkpath(char *, mode_t, mode_t);
-void usage(void);
+static void __dead usage(void);
int
main(int argc, char *argv[])
@@ -53,8 +52,6 @@ main(int argc, char *argv[])
void *set;
mode_t mode, dir_mode;
- setlocale(LC_ALL, "");
-
/*
* The default file mode is a=rwx (0777) with selected permissions
* removed in accordance with the file mode creation mask. For
@@ -117,7 +114,7 @@ main(int argc, char *argv[])
exitval = 1;
}
}
- exit(exitval);
+ return exitval;
}
/*
@@ -169,7 +166,7 @@ mkpath(char *path, mode_t mode, mode_t dir_mode)
return (0);
}
-void
+static void __dead
usage(void)
{
(void)fprintf(stderr, "usage: %s [-p] [-m mode] directory ...\n",