Macintosh-SW/EMILE
1
0
Fork 0
mirror of https://github.com/vivier/EMILE.git synced 2024-12-22 10:29:31 +00:00
Code Issues Projects Releases Wiki Activity

allow to provide disk and partition on command line (like "/dev/cdrom 1" instead of "/dev/hdc1"

Browse Source
This commit is contained in:
Laurent Vivier 2006-09-13 21:33:49 +00:00
parent a57f6a8617
commit 8113b3e654
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/emile-map-set.c
View File

@ -339,7 +339,7 @@ int main(int argc, char** argv)
emile_map_t *map; emile_map_t *map;
int ret; int ret;
int disk; int disk;
int partition; int partition = 0;
char *disk_name; char *disk_name;
char buffer[16]; char buffer[16];
int driver; int driver;
@ -391,6 +391,16 @@ int main(int argc, char** argv)
} }
if (optind < argc) if (optind < argc)
dev_name = argv[optind++]; dev_name = argv[optind++];
if (optind < argc)
{
partition = strtol(argv[optind++], NULL, 0);
if (partition == 0)
{
fprintf(stderr,
"ERROR: partition number cannot be 0 !\n");
return 1;
}
}
if ( !action && dev_name) if ( !action && dev_name)
{ {
@ -418,7 +428,10 @@ int main(int argc, char** argv)
return 1; return 1;
} }
ret = emile_scsi_get_rdev(dev_name, &driver, &disk, &partition); if (partition == 0)
ret = emile_scsi_get_rdev(dev_name, &driver, &disk, &partition);
else
ret = emile_scsi_get_rdev(dev_name, &driver, &disk, NULL);
if ( (ret == -1) && (optind < argc)) if ( (ret == -1) && (optind < argc))
{ {
disk_name = dev_name; disk_name = dev_name;