From 8de9ed220ea38e832cba833ade5f565d71419916 Mon Sep 17 00:00:00 2001 From: Joerg Wunsch Date: Thu, 5 Jul 2001 10:04:43 +0000 Subject: [PATCH] Make open_disk() fail nicely upon encountering an ENOENT so to not 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 --- sbin/fdisk/fdisk.c | 6 ++++-- sbin/i386/fdisk/fdisk.c | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sbin/fdisk/fdisk.c b/sbin/fdisk/fdisk.c index 1bf925f64334..1cb2ec3497ba 100644 --- a/sbin/fdisk/fdisk.c +++ b/sbin/fdisk/fdisk.c @@ -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; } diff --git a/sbin/i386/fdisk/fdisk.c b/sbin/i386/fdisk/fdisk.c index 1bf925f64334..1cb2ec3497ba 100644 --- a/sbin/i386/fdisk/fdisk.c +++ b/sbin/i386/fdisk/fdisk.c @@ -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; }