d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pickup SPECNAMELEN from <sys/param.h> and use it.

Browse Source 
A missing _PATH_DEVDB ("/var/run/dev.db") is not cause for a warning
anymore, the file is effectively optional these days.
This commit is contained in:
Poul-Henning Kamp 2000-09-16 21:58:53 +00:00
parent a2cdd9d93e
commit 3cea595248
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/libc/gen/devname.c
View File

@ -47,6 +47,7 @@ static char sccsid[] = "@(#)devname.c 8.2 (Berkeley) 4/29/95";
#include <paths.h>
#include <stdio.h>
#include <string.h>
#include <sys/param.h>
#include <sys/stat.h>
static char *
@ -63,10 +64,8 @@ xdevname(dev, type)
DBT data, key;
if (!db && !failure &&
!(db = dbopen(_PATH_DEVDB, O_RDONLY, 0, DB_HASH, NULL))) {
warn("warning: %s", _PATH_DEVDB);
!(db = dbopen(_PATH_DEVDB, O_RDONLY, 0, DB_HASH, NULL)))
failure = 1;
}
if (failure)
return (NULL);
@ -88,7 +87,7 @@ devname(dev, type)
dev_t dev;
mode_t type;
{
static char buf[30]; /* XXX: pick up from <sys/conf.h> */
static char buf[SPECNAMELEN + 1];
int i, j;
char *r;
@ -106,15 +105,11 @@ devname(dev, type)
}
/* Finally just format it */
r = buf;
if (minor(dev) > 255) {
sprintf(buf, "#%c%d:0x%x",
(type & S_IFMT) == S_IFCHR ? 'C' : 'B',
major(dev), minor(dev));
} else {
sprintf(buf, "#%c%d:%d",
(type & S_IFMT) == S_IFCHR ? 'C' : 'B',
major(dev), minor(dev));
}
return (r);
if (minor(dev) > 255)
r = "#%c:%d:0x%x";
else
r = "#%c:%d:0x%d";
snprintf(buf, SPECNAMELEN + 1, r,
(type & S_IFMT) == S_IFCHR ? 'C' : 'B', major(dev), minor(dev));
return (buf);
}