From owner-svn-src-stable@FreeBSD.ORG Thu Mar 10 01:02:54 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A2D3D106566C; Thu, 10 Mar 2011 01:02:54 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7506D8FC17; Thu, 10 Mar 2011 01:02:54 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p2A12sT0026154; Thu, 10 Mar 2011 01:02:54 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2A12sS3026152; Thu, 10 Mar 2011 01:02:54 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201103100102.p2A12sS3026152@svn.freebsd.org> From: Xin LI Date: Thu, 10 Mar 2011 01:02:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219440 - in stable: 7/usr.sbin/diskinfo 8/usr.sbin/diskinfo X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Mar 2011 01:02:54 -0000 Author: delphij Date: Thu Mar 10 01:02:53 2011 New Revision: 219440 URL: http://svn.freebsd.org/changeset/base/219440 Log: MFC r218432: 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. Modified: stable/8/usr.sbin/diskinfo/diskinfo.c Directory Properties: stable/8/usr.sbin/diskinfo/ (props changed) Changes in other areas also in this revision: Modified: stable/7/usr.sbin/diskinfo/diskinfo.c Directory Properties: stable/7/usr.sbin/diskinfo/ (props changed) Modified: stable/8/usr.sbin/diskinfo/diskinfo.c ============================================================================== --- stable/8/usr.sbin/diskinfo/diskinfo.c Wed Mar 9 23:11:30 2011 (r219439) +++ stable/8/usr.sbin/diskinfo/diskinfo.c Thu Mar 10 01:02:53 2011 (r219440) @@ -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); }