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

Don't do raw device 'r' mangling.

Browse Source 
Try to use vn%d.ctl for setup and control if possible.

This paves the way for a DEVFS/cloning vn driver.
This commit is contained in:
phk 2000-12-15 16:40:11 +00:00
parent da27cfab4f
commit 44d5616439
1 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
usr.sbin/vnconfig/vnconfig.c
View File

@ -101,7 +101,6 @@ char *configfile;
int config __P((struct vndisk *));
void getoptions __P((struct vndisk *, char *));
char *rawdevice __P((char *));
void readconfig __P((int));
static void usage __P((void));
static int getsize(const char *arg);
@ -314,8 +313,11 @@ config(vnp)
}
}
rdev = rawdevice(dev);
rdev = dev;
(void)asprintf(&rdev, "%s.ctl", dev);
f = fopen(rdev, "rw");
if (f == NULL)
f = fopen(dev, "rw");
if (f == NULL) {
warn("%s", dev);
return(1);
@ -555,28 +557,6 @@ getoptions(vnp, fstr)
vnp->oarg = NULL;
}
char *
rawdevice(dev)
char *dev;
{
register char *rawbuf, *dp, *ep;
struct stat sb;
int len;
len = strlen(dev);
rawbuf = malloc(len + 2);
strcpy(rawbuf, dev);
if (stat(rawbuf, &sb) != 0 || !S_ISCHR(sb.st_mode)) {
dp = rindex(rawbuf, '/');
if (dp) {
for (ep = &rawbuf[len]; ep > dp; --ep)
*(ep+1) = *ep;
*++ep = 'r';
}
}
return (rawbuf);
}
static void
usage()
{