shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-12 13:18:14 +03:00
Code

create_floppy_devices: fix logic for more than one floppy device

Browse Source
This commit is contained in:
Kay Sievers 2007-12-17 03:41:30 +01:00
parent 2bb4dd9766
commit be580fa5d8
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
extras/floppy/create_floppy_devices.c
View File

@ -69,6 +69,7 @@ void log_message(int priority, const char *format, ...)
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
char *dev; char *dev;
char *devname;
char node[64]; char node[64];
int type = 0, i, fdnum, c; int type = 0, i, fdnum, c;
int major = 2, minor; int major = 2, minor;
@ -123,12 +124,17 @@ int main(int argc, char **argv)
} }
dev = argv[optind]; 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); fprintf(stderr,"Device '%s' is not a floppy device\n", dev);
return 1; return 1;
} }
fdnum = strtol(dev + 2, NULL, 10); fdnum = strtol(&devname[2], NULL, 10);
if (fdnum < 0 || fdnum > 7) { if (fdnum < 0 || fdnum > 7) {
fprintf(stderr,"Floppy device number %d out of range (0-7)\n", fdnum); fprintf(stderr,"Floppy device number %d out of range (0-7)\n", fdnum);
return 1; return 1;