Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 24 Feb 2011 11:04:47 +0000 (UTC)
From:      Bruce Cran <brucec@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
Subject:   svn commit: r218995 - stable/7/usr.sbin/fdformat
Message-ID:  <201102241104.p1OB4l8p035598@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: brucec
Date: Thu Feb 24 11:04:47 2011
New Revision: 218995
URL: http://svn.freebsd.org/changeset/base/218995

Log:
  MFC r218910:
  
  The FD_FORM ioctl used to ignore errors from the floppy controller; now when
  it encounters an error it returns an error from the ioctl.
  Ignore any errors when using the FD_FORM ioctl.
  
  PR:   kern/103862

Modified:
  stable/7/usr.sbin/fdformat/fdformat.c
Directory Properties:
  stable/7/usr.sbin/fdformat/   (props changed)

Modified: stable/7/usr.sbin/fdformat/fdformat.c
==============================================================================
--- stable/7/usr.sbin/fdformat/fdformat.c	Thu Feb 24 11:03:16 2011	(r218994)
+++ stable/7/usr.sbin/fdformat/fdformat.c	Thu Feb 24 11:04:47 2011	(r218995)
@@ -75,8 +75,7 @@ format_track(int fd, int cyl, int secs, 
 		f.fd_formb_secno(i) = il[i+1];
 		f.fd_formb_secsize(i) = secsize;
 	}
-	if(ioctl(fd, FD_FORM, (caddr_t)&f) < 0)
-		err(EX_OSERR, "ioctl(FD_FORM)");
+	(void)ioctl(fd, FD_FORM, (caddr_t)&f);
 }
 
 static int



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201102241104.p1OB4l8p035598>