X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Fmknod.c;h=6fa6d8353aeaa1d20deb31828aad55d896b71576;hb=ec1a4b5a521b5adf295bc757c25231910f8c854b;hp=59294e9cbb156e36c2ab5adc67c75622049056d4;hpb=cad5364599eb5062d59e0c397ed638ddd61a8d5d;p=oweals%2Fbusybox.git

diff --git a/coreutils/mknod.c b/coreutils/mknod.c
index 59294e9cb..6fa6d8353 100644
--- a/coreutils/mknod.c
+++ b/coreutils/mknod.c
@@ -4,35 +4,21 @@
  *
  * 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 tarball for details.
  */
 
 /* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */
 
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <unistd.h>
+#include <sys/sysmacros.h>  // For makedev
+
 #include "busybox.h"
 #include "libcoreutils/coreutils.h"
 
 static const char modes_chars[] = { 'p', 'c', 'u', 'b', 0, 1, 1, 2 };
 static const mode_t modes_cubp[] = { S_IFIFO, S_IFCHR, S_IFBLK };
 
-extern int mknod_main(int argc, char **argv)
+int mknod_main(int argc, char **argv);
+int mknod_main(int argc, char **argv)
 {
 	mode_t mode;
 	dev_t dev;
@@ -46,11 +32,13 @@ extern int mknod_main(int argc, char **argv)
 		mode |= modes_cubp[(int)(name[4])];
 
 		dev = 0;
-		if ((*name != 'p') && ((argc -= 2) == 0)) {
-			dev = (bb_xgetularg10_bnd(argv[2], 0, 255) << 8)
-				+ bb_xgetularg10_bnd(argv[3], 0, 255);
+		if ((*name != 'p') && ((argc -= 2) == 2)) {
+			/* 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)));
 		}
-	
+
 		if (argc == 2) {
 			name = *argv;
 			if (mknod(name, mode, dev) == 0) {