Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/coreutils/mkdir.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (17 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/coreutils/mkdir.c (modified) (2 diffs)

branches/2.2.5/mindi-busybox/coreutils/mkdir.c

@@ -5 +5 @@
  * 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 tarball for details.
  */
 
@@ -30 +17 @@
  */
 
-#include <stdlib.h>
-#include <unistd.h>
+/* Nov 28, 2006      Yoshinori Sato <ysato@users.sourceforge.jp>: Add SELinux Support.
+ */
+
 #include <getopt.h> /* struct option */
-#include "busybox.h"
+#include "libbb.h"
+
+/* This is a NOFORK applet. Be very careful! */
 
 #if ENABLE_FEATURE_MKDIR_LONG_OPTIONS
-static const struct option mkdir_long_options[] = {
-    { "mode", 1, NULL, 'm' },
-    { "parents", 0, NULL, 'p' },
-    { 0, 0, 0, 0 }
-};
+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)
+int mkdir_main(int argc, char **argv);
+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
 
 #if ENABLE_FEATURE_MKDIR_LONG_OPTIONS
-    bb_applet_long_options = mkdir_long_options;
+    applet_long_options = mkdir_longopts;
 #endif
-    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);
+    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) {