From 4aca87515a5083ae0e31ce3177189fd43b6d05ac Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sat, 3 Jan 2015 13:58:15 +0100 Subject: patch to Vanilla Tomato 1.28 --- release/src/router/busybox/coreutils/mkdir.c | 69 +++++++++++++++------------- 1 file changed, 37 insertions(+), 32 deletions(-) (limited to 'release/src/router/busybox/coreutils/mkdir.c') diff --git a/release/src/router/busybox/coreutils/mkdir.c b/release/src/router/busybox/coreutils/mkdir.c index 50364f17..72bd1058 100644 --- a/release/src/router/busybox/coreutils/mkdir.c +++ b/release/src/router/busybox/coreutils/mkdir.c @@ -4,20 +4,7 @@ * * Copyright (C) 2001 Matt Kraai * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ /* BB_AUDIT SUSv3 compliant */ @@ -29,35 +16,53 @@ * conjunction with -m. */ -#include -#include -#include -#include "busybox.h" +/* Nov 28, 2006 Yoshinori Sato : Add SELinux Support. + */ -static const struct option mkdir_long_options[] = { - { "mode", 1, NULL, 'm' }, - { "parents", 0, NULL, 'p' }, - { 0, 0, 0, 0 } -}; +#include "libbb.h" -extern int mkdir_main (int argc, char **argv) +/* This is a NOFORK applet. Be very careful! */ + +#if ENABLE_FEATURE_MKDIR_LONG_OPTIONS +static const char mkdir_longopts[] ALIGN1 = + "mode\0" Required_argument "m" + "parents\0" No_argument "p" +#if ENABLE_SELINUX + "context\0" Required_argument "Z" +#endif + ; +#endif + +int mkdir_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; +int mkdir_main(int argc, char **argv) { mode_t mode = (mode_t)(-1); int status = EXIT_SUCCESS; int flags = 0; - unsigned long opt; + unsigned opt; char *smode; +#if ENABLE_SELINUX + security_context_t scontext; +#endif - bb_applet_long_options = mkdir_long_options; - opt = bb_getopt_ulflags(argc, argv, "m:p", &smode); - if(opt & 1) { - mode = 0777; - if (!bb_parse_mode (smode, &mode)) { - bb_error_msg_and_die ("invalid mode `%s'", smode); +#if ENABLE_FEATURE_MKDIR_LONG_OPTIONS + applet_long_options = mkdir_longopts; +#endif + opt = getopt32(argv, "m:p" USE_SELINUX("Z:"), &smode USE_SELINUX(,&scontext)); + if (opt & 1) { + mode = 0777; + if (!bb_parse_mode(smode, &mode)) { + bb_error_msg_and_die("invalid mode '%s'", smode); } } - if(opt & 2) + if (opt & 2) flags |= FILEUTILS_RECUR; +#if ENABLE_SELINUX + if (opt & 4) { + selinux_or_die(); + setfscreatecon_or_die(scontext); + } +#endif if (optind == argc) { bb_show_usage(); -- cgit v1.2.3-54-g00ecf