Now that we've got it, use FDOPT_NOERRLOG for fdformat and fdwrite to

avoid blasting the syslog with error messages from bad floppies.  Both
tools have their own error reporting anyway (which could easily be
cluttered by the syslog output on your terminal).

2 files changed, 9 insertions, 2 deletions

diff --git a/usr.sbin/fdformat/fdformat.c b/usr.sbin/fdformat/fdformat.c
index 15d4891..178fd2a 100644
--- a/usr.sbin/fdformat/fdformat.c
+++ b/usr.sbin/fdformat/fdformat.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1992-1994 by Joerg Wunsch, Dresden
+ * Copyright (C) 1992-1994,2001 by Joerg Wunsch, Dresden
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -173,6 +173,7 @@ main(int argc, char **argv)
 	int rate = -1, gaplen = -1, secsize = -1, steps = -1;
 	int fill = 0xf6, quiet = 0, verify = 1, verify_only = 0, confirm = 0;
 	int fd, c, track, error, tracks_per_dot, bytes_per_track, errs;
+	int fdopts;
 	const char *devname, *suffix;
 	struct fd_type fdt;
 
@@ -265,6 +266,9 @@ main(int argc, char **argv)
 
 	if(ioctl(fd, FD_GTYPE, &fdt) < 0)
 		errx(1, "not a floppy disk: %s", devname);
+	fdopts = FDOPT_NOERRLOG;
+	if (ioctl(fd, FD_SOPTS, &fdopts) == -1)
+		err(1, "ioctl(FD_SOPTS, FDOPT_NOERRLOG)");
 
 	switch(rate) {
 	case -1:  break;
diff --git a/usr.sbin/fdwrite/fdwrite.c b/usr.sbin/fdwrite/fdwrite.c
index 0a40ada..d5908f3 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;
+    int interactive = 1, fdopts;
     char *device= "/dev/fd0", *trackbuf = 0,*vrfybuf = 0;
     struct fd_type fdt;
     FILE *tty;
@@ -129,6 +129,9 @@ 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) {