ls: -g implies -l

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

diff --git a/coreutils/mkdir.c b/coreutils/mkdir.c
index f003db99fa25d606f2b83ab11168815e02f7f74a..0de0d5c3b137971308304f0a07fb07515a47a9d3 100644 (file)
--- a/coreutils/mkdir.c
+++ b/coreutils/mkdir.c
@@ -4,62 +4,75 @@
  *
  * 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 */
+/* http://www.opengroup.org/onlinepubs/007904975/utilities/mkdir.html */
+
+/* Mar 16, 2003      Manuel Novoa III   (mjn3@codepoet.org)
  *
+ * Fixed broken permission setting when -p was used; especially in
+ * conjunction with -m.
  */
 
-#include <errno.h>
-#include <getopt.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
+/* Nov 28, 2006      Yoshinori Sato <ysato@users.sourceforge.jp>: Add SELinux Support.
+ */
 
-#include "busybox.h"
+#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 UNUSED_PARAM, char **argv)
 {
-       mode_t mode = -1;
+       mode_t mode = (mode_t)(-1);
+       int status = EXIT_SUCCESS;
        int flags = 0;
-       int i, opt;
+       unsigned opt;
+       char *smode;
+#if ENABLE_SELINUX
+       security_context_t scontext;
+#endif
 
-       while ((opt = getopt (argc, argv, "m:p")) != -1) {
-               switch (opt) {
-               case 'm':
-                       mode = 0777;
-                       if (!parse_mode (optarg, &mode)) {
-                               error_msg_and_die ("invalid mode `%s'", optarg);
-                       }
-                       umask(0);
-                       break;
-               case 'p':
-                       flags |= FILEUTILS_RECUR;
-                       break;
-               default:
-                       show_usage ();
+#if ENABLE_FEATURE_MKDIR_LONG_OPTIONS
+       applet_long_options = mkdir_longopts;
+#endif
+       opt = getopt32(argv, "m:p" IF_SELINUX("Z:"), &smode IF_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)
+               flags |= FILEUTILS_RECUR;
+#if ENABLE_SELINUX
+       if (opt & 4) {
+               selinux_or_die();
+               setfscreatecon_or_die(scontext);
+       }
+#endif
 
-       if (optind == argc)
-               show_usage ();
+       argv += optind;
+       if (!argv[0])
+               bb_show_usage();
 
-       for (i = optind; i < argc; i++) {
-               make_directory (argv[i], mode, flags);
-       }
+       do {
+               if (bb_make_directory(*argv, mode, flags)) {
+                       status = EXIT_FAILURE;
+               }
+       } while (*++argv);
 
-       return(EXIT_SUCCESS);
+       return status;
 }