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

[laffer1 at midnightbsd.org]

Revision: 10773
          http://svnweb.midnightbsd.org/src/?rev=10773
Author:   laffer1
Date:     2018-06-09 22:37:18 -0400 (Sat, 09 Jun 2018)
Log Message:
-----------
sync with freebsd.

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

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

Modified: trunk/usr.sbin/fdwrite/Makefile
===================================================================
--- trunk/usr.sbin/fdwrite/Makefile	2018-06-10 02:36:50 UTC (rev 10772)
+++ trunk/usr.sbin/fdwrite/Makefile	2018-06-10 02:37:18 UTC (rev 10773)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 # ----------------------------------------------------------------------------
 # "THE BEER-WARE LICENSE" (Revision 42):
 # <phk at FreeBSD.org> wrote this file.  As long as you retain this notice you
@@ -5,9 +6,8 @@
 # this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 # ----------------------------------------------------------------------------
 #
-# $FreeBSD: src/usr.sbin/fdwrite/Makefile,v 1.11 2005/01/08 15:46:06 delphij Exp $
+# $FreeBSD: stable/10/usr.sbin/fdwrite/Makefile 201390 2010-01-02 11:07:44Z ed $
 
 PROG=	fdwrite
-WARNS?=	6
 
 .include <bsd.prog.mk>

Modified: trunk/usr.sbin/fdwrite/fdwrite.1
===================================================================
--- trunk/usr.sbin/fdwrite/fdwrite.1	2018-06-10 02:36:50 UTC (rev 10772)
+++ trunk/usr.sbin/fdwrite/fdwrite.1	2018-06-10 02:37:18 UTC (rev 10773)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
 .\"
 .\" ----------------------------------------------------------------------------
 .\" "THE BEER-WARE LICENSE" (Revision 42):
@@ -6,12 +7,12 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD: src/usr.sbin/fdwrite/fdwrite.1,v 1.24 2005/02/13 22:25:28 ru Exp $
+.\" $FreeBSD: stable/10/usr.sbin/fdwrite/fdwrite.1 233510 2012-03-26 15:18:14Z joel $
 .\"
 .\"
 .Dd September 16, 1993
+.Dt FDWRITE 1
 .Os
-.Dt FDWRITE 1
 .Sh NAME
 .Nm fdwrite
 .Nd format and write floppy disks
@@ -87,7 +88,7 @@
 was planned as a tool to make life easier when writing a set of floppies,
 one such use could be to write a tar-archive:
 .Pp
-.Dl "tar cf - . | gzip -9 | fdwrite -d /dev/fd0.1720 -v
+.Dl tar cf - . | gzip -9 | fdwrite -d /dev/fd0.1720 -v
 .Pp
 The main difference from using
 .Xr tar 1 Ns 's


Property changes on: trunk/usr.sbin/fdwrite/fdwrite.1
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.sbin/fdwrite/fdwrite.c
===================================================================
--- trunk/usr.sbin/fdwrite/fdwrite.c	2018-06-10 02:36:50 UTC (rev 10772)
+++ trunk/usr.sbin/fdwrite/fdwrite.c	2018-06-10 02:37:18 UTC (rev 10773)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * ----------------------------------------------------------------------------
  * "THE BEER-WARE LICENSE" (Revision 42):
@@ -6,7 +7,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD: src/usr.sbin/fdwrite/fdwrite.c,v 1.15 2005/01/08 15:46:06 delphij Exp $
+ * $FreeBSD: stable/10/usr.sbin/fdwrite/fdwrite.c 194892 2009-06-24 19:47:53Z joerg $
  *
  */
 
@@ -66,7 +67,7 @@
 {
     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 +131,6 @@
 
 	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) {