int main(int argc, char **argv)
{
char *dev;
+ char *devname;
char node[64];
int type = 0, i, fdnum, c;
int major = 2, minor;
uid_t uid = 0;
gid_t gid = 0;
- mode_t mode = 0;
+ mode_t mode = 0660;
int create_nodes = 0;
int print_nodes = 0;
- int unlink_nodes = 0;
int is_err = 0;
while ((c = getopt(argc, argv, "cudm:U:G:M:t:")) != -1) {
switch (c) {
case 'c':
create_nodes = 1;
- unlink_nodes = 0;
- break;
- case 'u':
- unlink_nodes = 1;
- create_nodes = 0;
break;
case 'd':
print_nodes = 1;
}
dev = argv[optind];
- if (dev[strlen(dev) - 3] != 'f' || dev[strlen(dev) -2 ] != 'd') {
+ devname = strrchr(dev, '/');
+ if (devname != NULL)
+ devname = &devname[1];
+ else
+ devname = dev;
+ if (strncmp(devname, "fd", 2) != 0) {
fprintf(stderr,"Device '%s' is not a floppy device\n", dev);
return 1;
}
- fdnum = strtol(dev + 2, NULL, 10);
+ fdnum = strtol(&devname[2], NULL, 10);
if (fdnum < 0 || fdnum > 7) {
fprintf(stderr,"Floppy device number %d out of range (0-7)\n", fdnum);
return 1;
if (type == 0)
return 0;
+ udev_config_init();
selinux_init();
i = 0;
printf("%s b %d %d %d\n", node, mode, major, minor);
if (create_nodes) {
unlink(node);
- selinux_setfscreatecon(node, NULL, mode);
+ selinux_setfscreatecon(node, NULL, S_IFBLK | mode);
mknod(node, S_IFBLK | mode, makedev(major,minor));
selinux_resetfscreatecon();
chown(node, uid, gid);
+ chmod(node, S_IFBLK | mode);
}
i++;
}