sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libutil: let opendisk(3) try /dev

Browse source 
If a device node is given without path, and opening the node fails
initially, prepend "/dev/" to the node name and try opening again.
This is more in line with NetBSD behavior.

Change-Id: Ib544aec52abe43132510f0e4b173b00fb3dbaab8
This commit is contained in:
David van Moolenbroek 2012-04-18 00:04:28 +02:00 committed by Lionel Sambuc
parent 6700874deb
commit de27460e2e
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/libutil/opendisk.c
View file

@ -54,6 +54,14 @@ __opendisk(const char *path, int flags, char *buf, size_t buflen, int iscooked,
int f; int f;
#endif #endif
#ifdef __minix
/*
* MINIX does not have the cooked/raw distinction. Do not prepend 'r'
* to the device name when generating a full path.
*/
iscooked = 1;
#endif
if (buf == NULL) { if (buf == NULL) {
errno = EFAULT; errno = EFAULT;
return (-1); return (-1);
@ -80,6 +88,7 @@ __opendisk(const char *path, int flags, char *buf, size_t buflen, int iscooked,
f = ofn(buf, flags, 0); f = ofn(buf, flags, 0);
if (f != -1 || errno != ENOENT) if (f != -1 || errno != ENOENT)
return (f); return (f);
#endif
if (strchr(path, '/') != NULL) if (strchr(path, '/') != NULL)
return (-1); return (-1);
@ -89,6 +98,7 @@ __opendisk(const char *path, int flags, char *buf, size_t buflen, int iscooked,
if (f != -1 || errno != ENOENT) if (f != -1 || errno != ENOENT)
return (f); return (f);
#ifndef __minix
snprintf(buf, buflen, "%s%s%s%c", _PATH_DEV, iscooked ? "" : "r", path, snprintf(buf, buflen, "%s%s%s%c", _PATH_DEV, iscooked ? "" : "r", path,
'a' + rawpart); 'a' + rawpart);
f = ofn(buf, flags, 0); f = ofn(buf, flags, 0);