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

If the user doesn't specify a device and we can't open any of the defaults,

Browse Source 
don't print an error using a uninitialised devbuf.
This commit is contained in:
dwmalone 2004-04-01 16:37:46 +00:00
parent 8ec79375ed
commit 998b49feb8
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
usr.sbin/cdcontrol/cdcontrol.c
View File

@ -1228,6 +1228,7 @@ char *parse (char *buf, int *cmd)
int open_cd ()
{
char devbuf[MAXPATHLEN];
const char *dev;
if (fd > -1)
return (1);
@ -1238,13 +1239,13 @@ int open_cd ()
} else {
snprintf (devbuf, MAXPATHLEN, "%s%s", _PATH_DEV, cdname);
}
fd = open (devbuf, O_RDONLY);
fd = open (dev = devbuf, O_RDONLY);
} else {
fd = open("/dev/cdrom", O_RDONLY);
fd = open(dev = "/dev/cdrom", O_RDONLY);
if (fd < 0 && errno == ENOENT)
fd = open("/dev/cd0", O_RDONLY);
fd = open(dev = "/dev/cd0", O_RDONLY);
if (fd < 0 && errno == ENOENT)
fd = open("/dev/acd0", O_RDONLY);
fd = open(dev = "/dev/acd0", O_RDONLY);
}
if (fd < 0) {
@ -1252,10 +1253,10 @@ int open_cd ()
/* ENXIO has an overloaded meaning here.
* The original "Device not configured" should
* be interpreted as "No disc in drive %s". */
warnx("no disc in drive %s", devbuf);
warnx("no disc in drive %s", dev);
return (0);
}
err(1, "%s", devbuf);
err(1, "%s", dev);
}
return (1);
}