inetd: fix order of array index check and array access

[oweals/busybox.git] / coreutils / mkdir.c

diff --git a/coreutils/mkdir.c b/coreutils/mkdir.c
index 48a95badbc760419b3548a6683d55d6b287e481e..864edfb0a1873f733d0605985aaaa0c59bf72387 100644 (file)
--- a/coreutils/mkdir.c
+++ b/coreutils/mkdir.c
@@ -4,20 +4,7 @@
  *
  * Copyright (C) 2001 Matt Kraai <kraai@alumni.carnegiemellon.edu>
  *
- * 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 source tree.
  */
 
 /* BB_AUDIT SUSv3 compliant */
@@ -29,41 +16,81 @@
  * conjunction with -m.
  */
 
-#include <stdlib.h>
-#include <unistd.h>
-#include <getopt.h> /* struct option */
-#include "busybox.h"
+/* Nov 28, 2006      Yoshinori Sato <ysato@users.sourceforge.jp>: Add SELinux Support.
+ */
+
+//usage:#define mkdir_trivial_usage
+//usage:       "[OPTIONS] DIRECTORY..."
+//usage:#define mkdir_full_usage "\n\n"
+//usage:       "Create DIRECTORY\n"
+//usage:     "\n       -m MODE Mode"
+//usage:     "\n       -p      No error if exists; make parent directories as needed"
+//usage:       IF_SELINUX(
+//usage:     "\n       -Z      Set security context"
+//usage:       )
+//usage:
+//usage:#define mkdir_example_usage
+//usage:       "$ mkdir /tmp/foo\n"
+//usage:       "$ mkdir /tmp/foo\n"
+//usage:       "/tmp/foo: File exists\n"
+//usage:       "$ mkdir /tmp/foo/bar/baz\n"
+//usage:       "/tmp/foo/bar/baz: No such file or directory\n"
+//usage:       "$ mkdir -p /tmp/foo/bar/baz\n"
 
-static const struct option mkdir_long_options[] = {
-       { "mode", 1, NULL, 'm' },
-       { "parents", 0, NULL, 'p' },
-       { 0, 0, 0, 0 }
-};
+#include "libbb.h"
 
-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
+#if ENABLE_FEATURE_VERBOSE
+       "verbose\0" No_argument       "v"
+#endif
+       ;
+#endif
+
+int mkdir_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int mkdir_main(int argc UNUSED_PARAM, char **argv)
 {
-       mode_t mode = (mode_t)(-1);
+       long mode = -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:pv" IF_SELINUX("Z:"), &smode IF_SELINUX(,&scontext));
+       if (opt & 1) {
+               mode_t mmode = 0777;
+               if (!bb_parse_mode(smode, &mmode)) {
+                       bb_error_msg_and_die("invalid mode '%s'", smode);
                }
+               mode = mmode;
        }
-       if(opt & 2)
+       if (opt & 2)
                flags |= FILEUTILS_RECUR;
-
-       if (optind == argc) {
-               bb_show_usage();
+       if ((opt & 4) && FILEUTILS_VERBOSE)
+               flags |= FILEUTILS_VERBOSE;
+#if ENABLE_SELINUX
+       if (opt & 8) {
+               selinux_or_die();
+               setfscreatecon_or_die(scontext);
        }
+#endif
 
        argv += optind;
+       if (!argv[0])
+               bb_show_usage();
 
        do {
                if (bb_make_directory(*argv, mode, flags)) {