X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=mknod.c;h=8f411a341ab9167247a4f384f5d981e04adf982a;hb=680d65a646feaea3c3440ca81732c3c09ae95d15;hp=0c93df64da3483e9c191513edc95f293942965d2;hpb=5e1189e187f6a7957dadb8eda2c271c4a0777a23;p=oweals%2Fbusybox.git

diff --git a/mknod.c b/mknod.c
index 0c93df64d..8f411a341 100644
--- a/mknod.c
+++ b/mknod.c
@@ -28,14 +28,17 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-static const char mknod_usage[] = "mknod [OPTIONS] NAME TYPE MAJOR MINOR\n\n"
-	"Create a special file (block, character, or pipe).\n\n"
+static const char mknod_usage[] = "mknod [OPTIONS] NAME TYPE MAJOR MINOR\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+	"\nCreate 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";
+	"\tp:\tMake a named pipe. MAJOR and MINOR are ignored for named pipes.\n"
+#endif
+	;
 
 int mknod_main(int argc, char **argv)
 {
@@ -58,6 +61,7 @@ int mknod_main(int argc, char **argv)
 			argc--;
 			argv++;
 			parse_mode(*argv, &perm);
+			umask(0);
 			break;
 		default:
 			usage(mknod_usage);
@@ -87,7 +91,7 @@ int mknod_main(int argc, char **argv)
 	}
 
 	if (mode == S_IFCHR || mode == S_IFBLK) {
-		dev = (atoi(argv[2]) << 8) | atoi(argv[1]);
+		dev = (atoi(argv[2]) << 8) | atoi(argv[3]);
 	}
 
 	mode |= perm;