X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Fmknod.c;h=eee0ac71dfd71ae1d6784c6951c05f3303b87eeb;hb=fb957125d8aa83c9df6e54292327983a51ee7ffd;hp=784a0353d67b9ab2c572756d3d01076c844429e8;hpb=cebea726e81bfaaf5718af0691733df7c6a5428e;p=oweals%2Fbusybox.git

diff --git a/coreutils/mknod.c b/coreutils/mknod.c
index 784a0353d..eee0ac71d 100644
--- a/coreutils/mknod.c
+++ b/coreutils/mknod.c
@@ -4,63 +4,83 @@
  *
  * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
  *
- * 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.
  */
+//config:config MKNOD
+//config:	bool "mknod (4.5 kb)"
+//config:	default y
+//config:	help
+//config:	mknod is used to create FIFOs or block/character special
+//config:	files with the specified names.
+
+//applet:IF_MKNOD(APPLET_NOEXEC(mknod, mknod, BB_DIR_BIN, BB_SUID_DROP, mknod))
+
+//kbuild:lib-$(CONFIG_MKNOD) += mknod.o
 
 /* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */
 
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
+//usage:#define mknod_trivial_usage
+//usage:       "[-m MODE] " IF_SELINUX("[-Z] ") "NAME TYPE [MAJOR MINOR]"
+//usage:#define mknod_full_usage "\n\n"
+//usage:       "Create a special file (block, character, or pipe)\n"
+//usage:     "\n	-m MODE	Creation mode (default a=rw)"
+//usage:	IF_SELINUX(
+//usage:     "\n	-Z	Set security context"
+//usage:	)
+//usage:     "\nTYPE:"
+//usage:     "\n	b	Block device"
+//usage:     "\n	c or u	Character device"
+//usage:     "\n	p	Named pipe (MAJOR MINOR must be omitted)"
+//usage:
+//usage:#define mknod_example_usage
+//usage:       "$ mknod /dev/fd0 b 2 0\n"
+//usage:       "$ mknod -m 644 /tmp/pipe p\n"
+
 #include <sys/sysmacros.h>  // For makedev
-#include <unistd.h>
-#include "busybox.h"
+
+#include "libbb.h"
 #include "libcoreutils/coreutils.h"
 
-static const char modes_chars[] = { 'p', 'c', 'u', 'b', 0, 1, 1, 2 };
+/* This is a NOEXEC applet. Be very careful! */
+
+static const char modes_chars[] ALIGN1 = { 'p', 'c', 'u', 'b', 0, 1, 1, 2 };
 static const mode_t modes_cubp[] = { S_IFIFO, S_IFCHR, S_IFBLK };
 
-int mknod_main(int argc, char **argv)
+int mknod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int mknod_main(int argc UNUSED_PARAM, char **argv)
 {
 	mode_t mode;
 	dev_t dev;
-	const char *name;
+	const char *type, *arg;
 
-	mode = getopt_mk_fifo_nod(argc, argv);
+	mode = getopt_mk_fifo_nod(argv);
 	argv += optind;
-	argc -= optind;
+	//argc -= optind;
 
-	if ((argc >= 2) && ((name = strchr(modes_chars, argv[1][0])) != NULL)) {
-		mode |= modes_cubp[(int)(name[4])];
+	if (!argv[0] || !argv[1])
+		bb_show_usage();
+	type = strchr(modes_chars, argv[1][0]);
+	if (!type)
+		bb_show_usage();
 
-		dev = 0;
-		if ((*name != 'p') && ((argc -= 2) == 2)) {
-			/* Autodetect what the system supports; thexe macros should
-			 * optimize out to two constants. */
-			dev = makedev(bb_xgetularg10_bnd(argv[2], 0, major(UINT_MAX)),
-						  bb_xgetularg10_bnd(argv[3], 0, minor(UINT_MAX)));
-		}
+	mode |= modes_cubp[(int)(type[4])];
+
+	dev = 0;
+	arg = argv[2];
+	if (*type != 'p') {
+		if (!argv[2] || !argv[3])
+			bb_show_usage();
+		/* Autodetect what the system supports; these macros should
+		 * optimize out to two constants. */
+		dev = makedev(xatoul_range(argv[2], 0, major(UINT_MAX)),
+				xatoul_range(argv[3], 0, minor(UINT_MAX)));
+		arg = argv[4];
+	}
+	if (arg)
+		bb_show_usage();
 
-		if (argc == 2) {
-			name = *argv;
-			if (mknod(name, mode, dev) == 0) {
-				return EXIT_SUCCESS;
-			}
-			bb_perror_msg_and_die("%s", name);
-		}
+	if (mknod(argv[0], mode, dev) != 0) {
+		bb_simple_perror_msg_and_die(argv[0]);
 	}
-	bb_show_usage();
+	return EXIT_SUCCESS;
 }