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

Improve error reporting in diskinfo(8) by not displaying errno when

Browse Source 
it doesn't make sense.
This commit is contained in:
trasz 2012-03-09 18:34:14 +00:00
parent aae0696a6a
commit f4c01e5c17
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
usr.sbin/diskinfo/diskinfo.c
View File

@ -99,13 +99,13 @@ main(int argc, char **argv)
}
error = ioctl(fd, DIOCGMEDIASIZE, &mediasize);
if (error) {
warn("%s: ioctl(DIOCGMEDIASIZE) failed, probably not a disk.", argv[i]);
warnx("%s: ioctl(DIOCGMEDIASIZE) failed, probably not a disk.", argv[i]);
exitval = 1;
goto out;
}
error = ioctl(fd, DIOCGSECTORSIZE, &sectorsize);
if (error) {
warn("%s: DIOCGSECTORSIZE failed, probably not a disk.", argv[i]);
warnx("%s: ioctl(DIOCGSECTORSIZE) failed, probably not a disk.", argv[i]);
exitval = 1;
goto out;
}
@ -178,8 +178,10 @@ rdsect(int fd, off_t blockno, u_int sectorsize)
lseek(fd, (off_t)blockno * sectorsize, SEEK_SET);
error = read(fd, sector, sectorsize);
if (error == -1)
err(1, "read");
if (error != (int)sectorsize)
err(1, "read error or disk too small for test.");
errx(1, "disk too small for test.");
}
static void
@ -188,8 +190,10 @@ rdmega(int fd)
int error;
error = read(fd, mega, sizeof(mega));
if (error == -1)
err(1, "read");
if (error != sizeof(mega))
err(1, "read error or disk too small for test.");
errx(1, "disk too small for test.");
}
static struct timeval tv1, tv2;