summaryrefslogtreecommitdiffstats
path: root/usr.sbin/fdwrite
diff options
context:
space:
mode:
authorjoerg <joerg@FreeBSD.org>2009-06-24 19:47:53 +0000
committerjoerg <joerg@FreeBSD.org>2009-06-24 19:47:53 +0000
commit28ee5250ac542f0374f1ec07f32276a5581a2353 (patch)
tree7c80e7b291959bae36b32f2ec52a06cf667479e5 /usr.sbin/fdwrite
parent8c4a62bd5baed926c5edabe6c2a36fe1d5cf7376 (diff)
downloadFreeBSD-src-28ee5250ac542f0374f1ec07f32276a5581a2353.zip
FreeBSD-src-28ee5250ac542f0374f1ec07f32276a5581a2353.tar.gz
Drop the defunct FDOPT_NOERRLOG option from all the floppy utilities.
The kernel does not log floppy media errors anymore. In fdcontrol, do always open the file descriptor in read-only mode so it can operate on read-only media, as there is no longer a separate control device to operate on.
Diffstat (limited to 'usr.sbin/fdwrite')
-rw-r--r--usr.sbin/fdwrite/fdwrite.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/usr.sbin/fdwrite/fdwrite.c b/usr.sbin/fdwrite/fdwrite.c
index 3c22091..8c953a6 100644
--- a/usr.sbin/fdwrite/fdwrite.c
+++ b/usr.sbin/fdwrite/fdwrite.c
@@ -66,7 +66,7 @@ main(int argc, char **argv)
{
int inputfd = -1, c, fdn = 0, i,j,fd;
int bpt, verbose=1, nbytes=0, track;
- int interactive = 1, fdopts;
+ int interactive = 1;
const char *device= "/dev/fd0";
char *trackbuf = 0,*vrfybuf = 0;
struct fd_type fdt;
@@ -130,9 +130,6 @@ main(int argc, char **argv)
if(ioctl(fd, FD_GTYPE, &fdt) < 0)
errx(1, "not a floppy disk: %s", device);
- fdopts = FDOPT_NOERRLOG;
- if (ioctl(fd, FD_SOPTS, &fdopts) == -1)
- err(1, "ioctl(FD_SOPTS, FDOPT_NOERRLOG)");
bpt = fdt.sectrac * (1<<fdt.secsize) * 128;
if(!trackbuf) {
OpenPOWER on IntegriCloud