[Midnightbsd-cvs] src [10795] trunk/usr.sbin/fdcontrol/fdcontrol.c: sync fdcontrol with freebsd 10

[laffer1 at midnightbsd.org]

Revision: 10795
          http://svnweb.midnightbsd.org/src/?rev=10795
Author:   laffer1
Date:     2018-06-09 23:00:33 -0400 (Sat, 09 Jun 2018)
Log Message:
-----------
sync fdcontrol with freebsd 10

Modified Paths:
--------------
    trunk/usr.sbin/fdcontrol/Makefile
    trunk/usr.sbin/fdcontrol/fdcontrol.8
    trunk/usr.sbin/fdcontrol/fdcontrol.c

Property Changed:
----------------
    trunk/usr.sbin/fdcontrol/fdcontrol.8

Modified: trunk/usr.sbin/fdcontrol/Makefile
===================================================================
--- trunk/usr.sbin/fdcontrol/Makefile	2018-06-10 02:59:17 UTC (rev 10794)
+++ trunk/usr.sbin/fdcontrol/Makefile	2018-06-10 03:00:33 UTC (rev 10795)
@@ -1,10 +1,10 @@
-# $FreeBSD: src/usr.sbin/fdcontrol/Makefile,v 1.12 2005/01/08 15:46:05 delphij Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/usr.sbin/fdcontrol/Makefile 201390 2010-01-02 11:07:44Z ed $
 
 .PATH: ${.CURDIR}/../fdread
 
 PROG=	fdcontrol
 SRCS=	fdcontrol.c fdutil.c
-WARNS?=	6
 CFLAGS+= -I${.CURDIR}/../fdread
 MAN=	fdcontrol.8
 

Modified: trunk/usr.sbin/fdcontrol/fdcontrol.8
===================================================================
--- trunk/usr.sbin/fdcontrol/fdcontrol.8	2018-06-10 02:59:17 UTC (rev 10794)
+++ trunk/usr.sbin/fdcontrol/fdcontrol.8	2018-06-10 03:00:33 UTC (rev 10795)
@@ -1,4 +1,4 @@
-'\" t
+.\" $MidnightBSD$
 .\" Copyright (C) 1994, 2001 by Joerg Wunsch, Dresden
 .\" All rights reserved.
 .\"
@@ -24,11 +24,11 @@
 .\" USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD: src/usr.sbin/fdcontrol/fdcontrol.8,v 1.21 2006/10/25 10:44:58 ru Exp $
+.\" $FreeBSD: stable/10/usr.sbin/fdcontrol/fdcontrol.8 208593 2010-05-27 13:56:19Z uqs $
 .\"
 .Dd December 25, 2001
+.Dt FDCONTROL 8
 .Os
-.Dt FDCONTROL 8
 .Sh NAME
 .Nm fdcontrol
 .Nd display and modify floppy disk parameters


Property changes on: trunk/usr.sbin/fdcontrol/fdcontrol.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.sbin/fdcontrol/fdcontrol.c
===================================================================
--- trunk/usr.sbin/fdcontrol/fdcontrol.c	2018-06-10 02:59:17 UTC (rev 10794)
+++ trunk/usr.sbin/fdcontrol/fdcontrol.c	2018-06-10 03:00:33 UTC (rev 10795)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * Copyright (C) 1994, 2001 by Joerg Wunsch, Dresden
  * All rights reserved.
@@ -26,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.sbin/fdcontrol/fdcontrol.c,v 1.14 2005/10/26 22:23:52 peter Exp $");
+__FBSDID("$FreeBSD: stable/10/usr.sbin/fdcontrol/fdcontrol.c 194892 2009-06-24 19:47:53Z joerg $");
 
 #include <sys/fdcio.h>
 #include <sys/file.h>
@@ -72,7 +73,7 @@
 	enum fd_drivetype type;
 	struct fd_type ft, newft, *fdtp;
 	const char *name, *descr;
-	int fd, i, mode, autofmt;
+	int fd, i, autofmt;
 
 	autofmt = 0;
 	while((i = getopt(argc, argv, "aFf:s:v")) != -1)
@@ -116,12 +117,7 @@
 	if(argc != 1)
 		usage();
 
-	if (show || showfmt)
-		mode = O_RDONLY | O_NONBLOCK;
-	else
-		mode = O_RDWR;
-
-	if((fd = open(argv[0], mode)) < 0)
+	if((fd = open(argv[0], O_RDONLY | O_NONBLOCK)) < 0)
 		err(EX_UNAVAILABLE, "open(%s)", argv[0]);
 
 	if (ioctl(fd, FD_GDTYPE, &type) == -1)