[Midnightbsd-cvs] src [10797] trunk/usr.sbin/fdformat/fdformat.c: sync with freebsd.

[laffer1 at midnightbsd.org]

Revision: 10797
          http://svnweb.midnightbsd.org/src/?rev=10797
Author:   laffer1
Date:     2018-06-09 23:07:14 -0400 (Sat, 09 Jun 2018)
Log Message:
-----------
sync with freebsd.

Modified Paths:
--------------
    trunk/usr.sbin/fdformat/Makefile
    trunk/usr.sbin/fdformat/fdformat.1
    trunk/usr.sbin/fdformat/fdformat.c

Property Changed:
----------------
    trunk/usr.sbin/fdformat/fdformat.1

Modified: trunk/usr.sbin/fdformat/Makefile
===================================================================
--- trunk/usr.sbin/fdformat/Makefile	2018-06-10 03:03:34 UTC (rev 10796)
+++ trunk/usr.sbin/fdformat/Makefile	2018-06-10 03:07:14 UTC (rev 10797)
@@ -1,11 +1,12 @@
-# $FreeBSD: src/usr.sbin/fdformat/Makefile,v 1.13 2005/01/08 15:46:05 delphij Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/usr.sbin/fdformat/Makefile 326918 2017-12-17 06:00:49Z cy $
 
 .PATH: ${.CURDIR}/../fdread
 
 PROG=	fdformat
+MAN=	fdformat.8
 SRCS=	fdformat.c fdutil.c
 
-WARNS?=	6
 CFLAGS+= -I${.CURDIR}/../fdread
 
 .if ${MACHINE} == "pc98"

Modified: trunk/usr.sbin/fdformat/fdformat.1
===================================================================
--- trunk/usr.sbin/fdformat/fdformat.1	2018-06-10 03:03:34 UTC (rev 10796)
+++ trunk/usr.sbin/fdformat/fdformat.1	2018-06-10 03:07:14 UTC (rev 10797)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
 .\" Copyright (C) 1993, 1994, 1995, 2001 by Joerg Wunsch, Dresden
 .\" All rights reserved.
 .\"


Property changes on: trunk/usr.sbin/fdformat/fdformat.1
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.sbin/fdformat/fdformat.c
===================================================================
--- trunk/usr.sbin/fdformat/fdformat.c	2018-06-10 03:03:34 UTC (rev 10796)
+++ trunk/usr.sbin/fdformat/fdformat.c	2018-06-10 03:07:14 UTC (rev 10797)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * Copyright (C) 1992-1994,2001 by Joerg Wunsch, Dresden
  * All rights reserved.
@@ -23,7 +24,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/usr.sbin/fdformat/fdformat.c,v 1.22 2004/08/20 15:14:25 phk Exp $
+ * $FreeBSD: stable/10/usr.sbin/fdformat/fdformat.c 218910 2011-02-21 09:56:08Z brucec $
  */
 
 #include <sys/types.h>
@@ -75,8 +76,7 @@
 		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
@@ -146,7 +146,7 @@
 	struct fdc_status fdcs[MAXPRINTERRS];
 	int format, fill, quiet, verify, verify_only, confirm;
 	int fd, c, i, track, error, tracks_per_dot, bytes_per_track, errs;
-	int fdopts, flags;
+	int flags;
 	char *fmtstring, *device;
 	const char *name, *descr;
 
@@ -250,11 +250,6 @@
 		errx(EX_OSERR, "not a floppy disk: %s", device);
 	if (ioctl(fd, FD_GDTYPE, &type) == -1)
 		err(EX_OSERR, "ioctl(FD_GDTYPE)");
-	if (ioctl(fd, FD_GOPTS, &fdopts) == -1)
-		err(EX_OSERR, "ioctl(FD_GOPTS)");
-	fdopts |= FDOPT_NOERRLOG;
-	if (ioctl(fd, FD_SOPTS, &fdopts) == -1)
-		err(EX_OSERR, "ioctl(FD_SOPTS, FDOPT_NOERRLOG)");
 	if (format) {
 		getname(type, &name, &descr);
 		fdtp = get_fmt(format, type);