svn commit: r218432 - head/usr.sbin/diskinfo
Xin LI
delphij at FreeBSD.org
Tue Feb 8 11:32:23 UTC 2011
Author: delphij
Date: Tue Feb 8 11:32:22 2011
New Revision: 218432
URL: http://svn.freebsd.org/changeset/base/218432
Log:
Don't consider ioctl returning error as a fatal error and move on to next
disk. When multiple devices are specified, a non-supporting ioctl will
cause diskinfo(8) to stop at the point which does not seem to be necessary.
Ok'ed by: phk
MFC after: 1 month
Modified:
head/usr.sbin/diskinfo/diskinfo.c
Modified: head/usr.sbin/diskinfo/diskinfo.c
==============================================================================
--- head/usr.sbin/diskinfo/diskinfo.c Tue Feb 8 09:28:28 2011 (r218431)
+++ head/usr.sbin/diskinfo/diskinfo.c Tue Feb 8 11:32:22 2011 (r218432)
@@ -56,7 +56,7 @@ static void commandtime(int fd, off_t me
int
main(int argc, char **argv)
{
- int i, ch, fd, error;
+ int i, ch, fd, error, exitval = 0;
char buf[BUFSIZ], ident[DISK_IDENT_SIZE];
off_t mediasize, stripesize, stripeoffset;
u_int sectorsize, fwsectors, fwheads;
@@ -90,14 +90,23 @@ main(int argc, char **argv)
sprintf(buf, "%s%s", _PATH_DEV, argv[i]);
fd = open(buf, O_RDONLY);
}
- if (fd < 0)
- err(1, argv[i]);
+ if (fd < 0) {
+ warn("%s", argv[i]);
+ exitval = 1;
+ goto out;
+ }
error = ioctl(fd, DIOCGMEDIASIZE, &mediasize);
- if (error)
- err(1, "%s: ioctl(DIOCGMEDIASIZE) failed, probably not a disk.", argv[i]);
+ if (error) {
+ warn("%s: ioctl(DIOCGMEDIASIZE) failed, probably not a disk.", argv[i]);
+ exitval = 1;
+ goto out;
+ }
error = ioctl(fd, DIOCGSECTORSIZE, §orsize);
- if (error)
- err(1, "%s: DIOCGSECTORSIZE failed, probably not a disk.", argv[i]);
+ if (error) {
+ warn("%s: DIOCGSECTORSIZE failed, probably not a disk.", argv[i]);
+ exitval = 1;
+ goto out;
+ }
error = ioctl(fd, DIOCGFWSECTORS, &fwsectors);
if (error)
fwsectors = 0;
@@ -148,9 +157,10 @@ main(int argc, char **argv)
commandtime(fd, mediasize, sectorsize);
if (opt_t)
speeddisk(fd, mediasize, sectorsize);
+out:
close(fd);
}
- exit (0);
+ exit (exitval);
}
More information about the svn-src-head
mailing list