[Midnightbsd-cvs] src [11353] trunk/bin/chio/chio.c: sync chio with freebsd 10 stable

[laffer1 at midnightbsd.org]

Revision: 11353
          http://svnweb.midnightbsd.org/src/?rev=11353
Author:   laffer1
Date:     2018-07-06 08:04:38 -0400 (Fri, 06 Jul 2018)
Log Message:
-----------
sync chio with freebsd 10 stable

Modified Paths:
--------------
    trunk/bin/chio/Makefile
    trunk/bin/chio/chio.1
    trunk/bin/chio/chio.c

Property Changed:
----------------
    trunk/bin/chio/chio.1

Modified: trunk/bin/chio/Makefile
===================================================================
--- trunk/bin/chio/Makefile	2018-07-06 12:03:50 UTC (rev 11352)
+++ trunk/bin/chio/Makefile	2018-07-06 12:04:38 UTC (rev 11353)
@@ -1,5 +1,5 @@
 # $MidnightBSD$
-# $FreeBSD: src/bin/chio/Makefile,v 1.12 2005/01/27 13:25:09 delphij Exp $
+# $FreeBSD: stable/10/bin/chio/Makefile 140902 2005-01-27 13:25:09Z delphij $
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 PROG=	chio

Modified: trunk/bin/chio/chio.1
===================================================================
--- trunk/bin/chio/chio.1	2018-07-06 12:03:50 UTC (rev 11352)
+++ trunk/bin/chio/chio.1	2018-07-06 12:04:38 UTC (rev 11353)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
 .\"	$NetBSD: chio.1,v 1.4 1997/10/02 00:41:25 hubertf Exp $
 .\"-
 .\" Copyright (c) 1996 Jason R. Thorpe <thorpej at and.com>
@@ -30,10 +31,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/bin/chio/chio.1,v 1.27 2005/01/16 16:41:55 ru Exp $
-.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/bin/chio/chio.1 307403 2016-10-16 22:02:50Z sevan $
 .\"
-.Dd May 14, 1998
+.Dd October 5, 2016
 .Dt CHIO 1
 .Os
 .Sh NAME
@@ -62,10 +62,6 @@
 .Pa /dev/ch0 .
 .El
 .Pp
-The default changer may be overridden by setting the environment variable
-.Ev CHANGER
-to the desired changer device.
-.Pp
 A medium changer apparatus is made up of
 .Em elements .
 There are five element types:
@@ -268,6 +264,12 @@
 .It INENAB
 Element supports receiving media (importing) from an outside human operator.
 .El
+.Sh ENVIRONMENT
+.Bl -tag -width CHANGER
+.It Ev CHANGER
+The default changer may be overridden by setting this environmental
+variable to the desired changer device.
+.El
 .Sh FILES
 .Bl -tag -width /dev/ch0 -compact
 .It Pa /dev/ch0
@@ -288,18 +290,24 @@
 .Sh SEE ALSO
 .Xr mt 1 ,
 .Xr mount 8
+.Sh HISTORY
+A
+.Nm
+utility appeared in
+.Nx 1.3 .
+.Nm
+first appeared in
+.Fx 2.2 .
 .Sh AUTHORS
 .An -nosplit
 The
 .Nm
 program and SCSI changer driver were written by
-.An Jason R. Thorpe Aq thorpej at and.com
+.An Jason R. Thorpe Aq Mt thorpej at and.com
 for And Communications,
 .Pa http://www.and.com/ .
 .Pp
 Additional work by
-.An Hans Huebner
-.Aq hans at artcom.de
+.An Hans Huebner Aq Mt hans at artcom.de
 and
-.An Steve Gunn
-.Aq csg at waterspout.com .
+.An Steve Gunn Aq Mt csg at waterspout.com .


Property changes on: trunk/bin/chio/chio.1
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/bin/chio/chio.c
===================================================================
--- trunk/bin/chio/chio.c	2018-07-06 12:03:50 UTC (rev 11352)
+++ trunk/bin/chio/chio.c	2018-07-06 12:04:38 UTC (rev 11353)
@@ -35,7 +35,6 @@
  * Additional Copyright (c) 1997, by Matthew Jacob, for NASA/Ames Research Ctr.
  * Addidional Copyright (c) 2000, by C. Stephen Gunn, Waterspout Communications
  */
-/* $FreeBSD: src/bin/chio/chio.c,v 1.27 2005/01/10 08:39:20 imp Exp $ */
 
 #if 0
 #ifndef lint
@@ -45,6 +44,7 @@
 #endif
 
 #include <sys/cdefs.h>
+__FBSDID("$FreeBSD: stable/10/bin/chio/chio.c 249658 2013-04-19 20:03:51Z ken $");
 
 #include <sys/param.h>
 #include <sys/chio.h> 
@@ -91,7 +91,7 @@
 #endif
 
 /* Valid changer element types. */
-const struct element_type elements[] = {
+static	const struct element_type elements[] = {
 	{ "drive",		CHET_DT },
 	{ "picker",		CHET_MT },
 	{ "portal",		CHET_IE },
@@ -101,7 +101,7 @@
 };
 
 /* Valid commands. */
-const struct changer_command commands[] = {
+static	const struct changer_command commands[] = {
 	{ "exchange",		do_exchange },
 	{ "getpicker",		do_getpicker },
 	{ "ielem", 		do_ielem },
@@ -116,7 +116,7 @@
 };
 
 /* Valid special words. */
-const struct special_word specials[] = {
+static	const struct special_word specials[] = {
 	{ "inv",		SW_INVERT },
 	{ "inv1",		SW_INVERT1 },
 	{ "inv2",		SW_INVERT2 },