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

Timestamp:

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

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

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

branches/2.2.5/mindi-busybox/coreutils/libcoreutils/getopt_mk_fifo_nod.c

@@ -21 +21 @@
  */
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
 #include "libbb.h"
 #include "coreutils.h"
@@ -31 +28 @@
     mode_t mode = 0666;
     char *smode = NULL;
-
-    bb_getopt_ulflags(argc, argv, "m:", &smode);
-    if(smode) {
+#if ENABLE_SELINUX
+    security_context_t scontext;
+#endif
+    int opt;
+    opt = getopt32(argv, "m:" USE_SELINUX("Z:"), &smode USE_SELINUX(,&scontext));
+    if (opt & 1) {
         if (bb_parse_mode(smode, &mode))
             umask(0);
     }
+
+#if ENABLE_SELINUX
+    if (opt & 2) {
+        selinux_or_die();
+        setfscreatecon_or_die(scontext);
+    }
+#endif
+
     return mode;
 }