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

Make open_disk() fail nicely upon encountering an ENOENT so to not

Browse Source 
prematurely terminate the search for a usable disk.  ENOENT is quite
normal in particulare now with the advent of devfs.

While being here, also remove /dev/wd0 and /dev/od0 from the list of
disks to search since we don't have them anymore.

MFC after:	1 week
This commit is contained in:
Joerg Wunsch 2001-07-05 10:04:43 +00:00
parent 6209021ebd
commit 8de9ed220e
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sbin/fdisk/fdisk.c
View File

@ -69,7 +69,7 @@ int secsize = 0; /* the sensed sector size */
const char *disk;
const char *disks[] =
{
"/dev/ad0", "/dev/wd0", "/dev/da0", "/dev/od0", 0
"/dev/ad0", "/dev/da0", 0
};
struct disklabel disklabel; /* disk parameters */
@ -692,9 +692,11 @@ int fd;
static int
open_disk(int u_flag)
{
struct stat st;
struct stat st;
if (stat(disk, &st) == -1) {
if (errno == ENOENT)
return -2;
warnx("can't get file status of %s", disk);
return -1;
}

6
sbin/i386/fdisk/fdisk.c
View File

@ -69,7 +69,7 @@ int secsize = 0; /* the sensed sector size */
const char *disk;
const char *disks[] =
{
"/dev/ad0", "/dev/wd0", "/dev/da0", "/dev/od0", 0
"/dev/ad0", "/dev/da0", 0
};
struct disklabel disklabel; /* disk parameters */
@ -692,9 +692,11 @@ int fd;
static int
open_disk(int u_flag)
{
struct stat st;
struct stat st;
if (stat(disk, &st) == -1) {
if (errno == ENOENT)
return -2;
warnx("can't get file status of %s", disk);
return -1;
}