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

diff --git a/coreutils/mknod.c b/coreutils/mknod.c
index caa234f1f..eee0ac71d 100644
--- a/coreutils/mknod.c
+++ b/coreutils/mknod.c
@@ -1,100 +1,86 @@
 /* vi: set sw=4 ts=4: */
 /*
- * Mini mknod implementation for busybox
+ * mknod implementation for busybox
  *
- * Copyright (C) 1995, 1996 by Bruce Perens <bruce@pixar.com>.
- *
- * 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
+ * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
  *
+ * 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. */
+
+//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 "internal.h"
-#include <stdio.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
+#include "libbb.h"
+#include "libcoreutils/coreutils.h"
 
-static const char mknod_usage[] = "mknod [OPTIONS] NAME TYPE MAJOR MINOR\n\n"
-	"Create a special file (block, character, or pipe).\n\n"
-	"Options:\n"
-	"\t-m\tcreate the special file using the specified mode (default a=rw)\n\n"
-	"TYPEs include:\n"
-	"\tb:\tMake a block (buffered) device.\n"
-	"\tc or u:\tMake a character (un-buffered) device.\n"
-	"\tp:\tMake a named pipe. MAJOR and MINOR are ignored for named pipes.\n";
+/* This is a NOEXEC applet. Be very careful! */
 
-int mknod_main(int argc, char **argv)
+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) MAIN_EXTERNALLY_VISIBLE;
+int mknod_main(int argc UNUSED_PARAM, char **argv)
 {
-	char *thisarg;
-	mode_t mode = 0;
-	mode_t perm = 0666;
-	dev_t dev = 0;
+	mode_t mode;
+	dev_t dev;
+	const char *type, *arg;
 
-	argc--;
-	argv++;
+	mode = getopt_mk_fifo_nod(argv);
+	argv += optind;
+	//argc -= optind;
 
-	/* Parse any options */
-	while (argc > 1) {
-		if (**argv != '-')
-			break;
-		thisarg = *argv;
-		thisarg++;
-		switch (*thisarg) {
-		case 'm':
-			argc--;
-			argv++;
-			parse_mode(*argv, &perm);
-			umask(0);
-			break;
-		default:
-			usage(mknod_usage);
-		}
-		argc--;
-		argv++;
-	}
-	if (argc != 4 && argc != 2) {
-		usage(mknod_usage);
-	}
-	switch (argv[1][0]) {
-	case 'c':
-	case 'u':
-		mode = S_IFCHR;
-		break;
-	case 'b':
-		mode = S_IFBLK;
-		break;
-	case 'p':
-		mode = S_IFIFO;
-		if (argc!=2) {
-			usage(mknod_usage);
-		}
-		break;
-	default:
-		usage(mknod_usage);
-	}
+	if (!argv[0] || !argv[1])
+		bb_show_usage();
+	type = strchr(modes_chars, argv[1][0]);
+	if (!type)
+		bb_show_usage();
 
-	if (mode == S_IFCHR || mode == S_IFBLK) {
-		dev = (atoi(argv[2]) << 8) | atoi(argv[3]);
-	}
+	mode |= modes_cubp[(int)(type[4])];
 
-	mode |= perm;
+	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 (mknod(argv[0], mode, dev) != 0)
-		fatalError("%s: %s\n", argv[0], strerror(errno));
-	exit (TRUE);
+	if (mknod(argv[0], mode, dev) != 0) {
+		bb_simple_perror_msg_and_die(argv[0]);
+	}
+	return EXIT_SUCCESS;
 }
-