From 4aca87515a5083ae0e31ce3177189fd43b6d05ac Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Sat, 3 Jan 2015 13:58:15 +0100
Subject: patch to Vanilla Tomato 1.28

---
 .../coreutils/libcoreutils/getopt_mk_fifo_nod.c    | 29 ++++++++++++----------
 1 file changed, 16 insertions(+), 13 deletions(-)

(limited to 'release/src/router/busybox/coreutils/libcoreutils/getopt_mk_fifo_nod.c')

diff --git a/release/src/router/busybox/coreutils/libcoreutils/getopt_mk_fifo_nod.c b/release/src/router/busybox/coreutils/libcoreutils/getopt_mk_fifo_nod.c
index 0872bdcf..ba3222e4 100644
--- a/release/src/router/busybox/coreutils/libcoreutils/getopt_mk_fifo_nod.c
+++ b/release/src/router/busybox/coreutils/libcoreutils/getopt_mk_fifo_nod.c
@@ -20,26 +20,29 @@
  *
  */
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
 #include "libbb.h"
 #include "coreutils.h"
 
-extern mode_t getopt_mk_fifo_nod(int argc, char **argv)
+mode_t FAST_FUNC getopt_mk_fifo_nod(char **argv)
 {
 	mode_t mode = 0666;
+	char *smode = NULL;
+#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);
+	}
 
-	while ((opt = getopt(argc, argv, "m:")) > 0) {
-		if (opt == 'm') {
-			mode = 0666;
-			if (bb_parse_mode(optarg, &mode)) {
-				umask(0);
-				continue;
-			}
-		}
-		bb_show_usage();
+#if ENABLE_SELINUX
+	if (opt & 2) {
+		selinux_or_die();
+		setfscreatecon_or_die(scontext);
 	}
+#endif
+
 	return mode;
 }
-- 
cgit v1.2.3-54-g00ecf