emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BusyBox has no business hard coding the number of major and minor bits for a

Browse Source 
dev_t.  This is especially important now that the user space concept of a dev_t
and the kernel concept of a dev_t are divergant.  The only bit of user space
allowed to know the number of major and minor bits is include/sys/sysmacros.h
(i.e. part of libc).  When used with a current C library and a 2.6.x kernel,
this fix should allow BusyBox to support wide device major/minor numbers.
 -Erik
This commit is contained in:
Eric Andersen
2004-07-26 09:11:12 +00:00
parent 5dcf15e02d
commit 4f807a84c5
5 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
miscutils/makedevs.c
View File

@ -13,21 +13,22 @@
#include <fcntl.h>
#include <unistd.h>
#include <sys/types.h>
#include <sys/sysmacros.h> /* major() and minor() */
#include "busybox.h"
int makedevs_main(int argc, char **argv)
{
mode_t mode;
char *basedev, *type, *nodname, buf[255];
int major, Sminor, S, E;
int Smajor, Sminor, S, E;
if (argc < 7 || *argv[1]=='-')
bb_show_usage();
basedev = argv[1];
type = argv[2];
major = atoi(argv[3]) << 8; /* correcting param to mknod() */
Sminor = atoi(argv[4]);
Smajor = major(atoi(argv[3]));
Sminor = minor(atoi(argv[4]));
S = atoi(argv[5]);
E = atoi(argv[6]);
nodname = argc == 8 ? basedev : buf;
@ -57,7 +58,7 @@ int makedevs_main(int argc, char **argv)
/* if mode != S_IFCHR and != S_IFBLK third param in mknod() ignored */
if (mknod(nodname, mode, major | Sminor))
if (mknod(nodname, mode, Smajor | Sminor))
bb_error_msg("Failed to create: %s", nodname);
if (nodname == basedev) /* ex. /dev/hda - to /dev/hda1 ... */