This commit was manufactured by cvs2svn to create tag

'RELENG_2_2_1_RELEASE'.

This commit was manufactured to restore the state of the 2.2.1-RELEASE image.
Releases prior to 5.3-RELEASE are omitting the secure/ and crypto/ subdirs.

Makefile

@@ -1,11 +1,13 @@
 #
-#	$Id: Makefile,v 1.108 1996/10/25 14:22:50 bde Exp $
+#	$Id: Makefile,v 1.109.2.2 1996/12/20 08:20:06 asami Exp $
 #
 # Make command line options:
 #	-DCLOBBER will remove /usr/include
 #	-DMAKE_LOCAL to add ./local to the SUBDIR list
 #	-DMAKE_PORTS to add ./ports to the SUBDIR list
 #	-DMAKE_EBONES to build eBones (KerberosIV)
+#	-DALLLANG to build documentation for all languages
+#	  (where available -- see share/doc/Makefile)
 #
 #	-DNOCLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
 #	-DNOCLEAN do not clean at all
@@ -129,7 +131,7 @@ MK_FLAGS=	-DNOMAN -DNOPROFILE
 #
 world:
 	@echo "--------------------------------------------------------------"
-	@echo "make world started on `LC_TIME= date`"
+	@echo "make world started on `LC_TIME=C date`"
 	@echo "--------------------------------------------------------------"
 .if target(pre-world)
 	@echo "--------------------------------------------------------------"
@@ -222,7 +224,7 @@ world:
 .endif
 	@echo
 	@echo "--------------------------------------------------------------"
-	@echo "make world completed on `LC_TIME= date`"
+	@echo "make world completed on `LC_TIME=C date`"
 	@echo "--------------------------------------------------------------"
 
 #

README

@@ -0,0 +1,73 @@
+This is the top level of the FreeBSD source directory.  This file
+was last revised on: $Id: README,v 1.7 1997/01/01 14:06:29 jkh Exp $
+
+For copyright information, please see the file COPYRIGHT in this
+directory (additional copyright information also exists for some
+sources in this tree - please see the specific source directories for
+more information).
+
+The Makefile in this directory supports a number of targets for
+building components (or all) of the FreeBSD source tree, the most
+commonly used one being ``world'', which rebuilds and installs
+everything in the FreeBSD system from the source tree except the
+kernel.  Please see the top of the Makefile for more information on
+the standard build targets and compile-time flags.
+
+Building a kernel with config(1) is a somewhat more involved process,
+documentation for which can be found at:
+   http://www.freebsd.org/handbook/kernelconfig.html
+And in the config(1) man page.
+
+The sample kernel configuration files reside in the sys/i386/conf
+sub-directory (assuming that you've installed the kernel sources), the
+file named GENERIC being the one used to build your initial installation
+kernel.  The file LINT contains entries for all possible devices, not
+just those commonly used, and is meant more as a general reference
+than an actual kernel configuration file (a kernel built from it
+wouldn't even run).
+
+
+Source Roadmap:
+---------------
+bin		System/User commands.
+
+contrib		Packages contributed by 3rd parties.
+
+eBones		Kerberos package - NOT FOR EXPORT!
+
+etc		Template files for /etc
+
+games		Amusements.
+
+gnu		Various commands and libraries under the GNU Public License.
+		Please see gnu/COPYING* for more information.
+
+include		System include files.
+
+lib		System libraries.
+
+libexec		System daemons.
+
+lkm		Loadable Kernel Modules.
+
+release		Release building Makefile & associated tools.
+
+sbin		System commands.
+
+secure		DES and DES-related utilities - NOT FOR EXPORT!
+
+share		Shared resources.
+
+sys		Kernel sources.
+
+tools		Utilities for regression testing and miscellaneous tasks.
+
+usr.bin		User commands.
+
+usr.sbin	System administration commands.
+
+
+For information on synchronizing your source tree with one or more of
+the FreeBSD Project's development branches, please see:
+
+  http://www.freebsd.org/handbook/synching.html

bin/Makefile

@@ -1,7 +1,7 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id: Makefile,v 1.3 1995/09/29 19:31:55 ache Exp $
+#	$Id: Makefile,v 1.4.2.1 1997/03/07 09:39:06 joerg Exp $
 
-SUBDIR= cat chmod cp csh date dd df domainname echo ed expr hostname \
+SUBDIR= cat chio chmod cp csh date dd df domainname echo ed expr hostname \
 	kill ln ls mkdir mv pax ps pwd rcp rm rmail rmdir sh sleep \
 	stty sync test
 

bin/Makefile.inc

@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 5/31/93
-#	$Id$
+#	$Id: Makefile.inc,v 1.7 1996/09/22 21:51:04 wosch Exp $
 
 BINDIR?=	/bin
 NOSHARED?=	YES

bin/cat/Makefile

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+#	$Id: Makefile,v 1.2 1994/09/24 02:53:25 davidg Exp $
 
 PROG=	cat
 

bin/cat/cat.1

@@ -32,10 +32,10 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     @(#)cat.1	8.1 (Berkeley) 6/29/93
-.\"	$Id: cat.1,v 1.2 1994/09/24 02:53:25 davidg Exp $
+.\"     @(#)cat.1	8.3 (Berkeley) 5/2/95
+.\"	$Id: cat.1,v 1.3.2.1 1997/02/28 07:54:20 mpp Exp $
 .\"
-.Dd June 29, 1993
+.Dd May 2, 1995
 .Dt CAT 1
 .Os BSD 3
 .Sh NAME
@@ -69,9 +69,7 @@ option, and displays a dollar sign
 at the end of each line
 as well.
 .It Fl n
-Number the
-.Ar output
-lines, starting at 1.
+Number the output lines, starting at 1.
 .It Fl s
 Squeeze multiple adjacent empty lines, causing the output to be
 single spaced.
@@ -79,7 +77,7 @@ single spaced.
 Implies the
 .Fl v
 option, and displays tab characters as
-.Pq Ql ^I
+.Ql ^I
 as well.
 .It Fl u
 The
@@ -109,7 +107,8 @@ will cause the original data in file1 to be destroyed!
 .Xr head 1 ,
 .Xr more 1 ,
 .Xr pr 1 ,
-.Xr tail 1
+.Xr tail 1 ,
+.Xr vis 1
 .Rs
 .%A Rob Pike
 .%T "UNIX Style, or cat -v Considered Harmful"

bin/cat/cat.c

@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cat.c,v 1.4 1996/09/28 21:19:27 imp Exp $
+ *	$Id: cat.c,v 1.5 1996/09/30 15:45:36 ache Exp $
  */
 
 #ifndef lint

bin/chflags/Makefile

@@ -1,9 +0,0 @@
-#	@(#)Makefile	8.1 (Berkeley) 6/6/93
-
-NOSHARED=	true
-
-PROG=	chflags
-SRCS=	chflags.c stat_flags.c
-.PATH:	${.CURDIR}/../../bin/ls
-
-.include <bsd.prog.mk>

bin/chflags/chflags.1

@@ -1,125 +0,0 @@
-.\" Copyright (c) 1989, 1990, 1993, 1994
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the Institute of Electrical and Electronics Engineers, Inc.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"	@(#)chflags.1	8.2 (Berkeley) 3/31/94
-.\"
-.Dd March 31, 1994
-.Dt CHFLAGS 1
-.Os
-.Sh NAME
-.Nm chflags
-.Nd change file flags
-.Sh SYNOPSIS
-.Nm chflags
-.Oo
-.Fl R
-.Op Fl H | Fl L | Fl P
-.Oc
-.Ar flags
-.Ar file ...
-.Sh DESCRIPTION
-The
-.Nm chflags
-utility modifies the file flags of the listed files
-as specified by the
-.Ar flags
-operand.
-.Pp
-The options are as follows:
-.Bl -tag -width Ds
-.It Fl H
-If the
-.Fl R
-option is specified, symbolic links on the command line are followed.
-(Symbolic links encountered in the tree traversal are not followed.)
-.It Fl L
-If the
-.Fl R
-option is specified, all symbolic links are followed.
-.It Fl P
-If the
-.Fl R
-option is specified, no symbolic links are followed.
-.It Fl R
-Change the file flags for the file hierarchies rooted
-in the files instead of just the files themselves.
-.El
-.Pp
-Flags are a comma separated list of keywords.
-The following keywords are currently defined:
-.Bd -literal -offset indent compact
-arch	set the archived flag (super-user only)
-dump	set the dump flag
-sappnd	set the system append-only flag (super-user only)
-schg	set the system immutable flag (super-user only)
-uappnd	set the user append-only flag (owner or super-user only)
-uchg	set the user immutable flag (owner or super-user only)
-archived, sappend, schange, simmutable, uappend, uchange, uimmutable
-	aliases for the above
-.Ed
-.Pp
-Putting the letters
-.Dq no
-before an option causes the flag to be turned off.
-For example:
-.Bd -literal -offset indent compact
-nodump	the file should never be dumped
-.Ed
-.Pp
-Symbolic links do not have flags, so unless the
-.Fl H
-or
-.Fl L
-option is set,
-.Nm chflags
-on a symbolic link always succeeds and has no effect.
-The
-.Fl H ,
-.Fl L
-and
-.Fl P
-options are ignored unless the
-.Fl R
-option is specified.
-In addition, these options override each other and the
-command's actions are determined by the last one specified.
-.Pp
-The
-.Nm chflags
-utility exits 0 on success, and >0 if an error occurs.
-.Sh SEE ALSO
-.Xr chflags 2 ,
-.Xr stat 2 ,
-.Xr fts 3 ,
-.Xr symlink 7

bin/chflags/chflags.c

@@ -1,180 +0,0 @@
-/*
- * Copyright (c) 1992, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1992, 1993, 1994\n\
-	The Regents of the University of California.  All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-static char sccsid[] = "@(#)chflags.c	8.5 (Berkeley) 4/1/94";
-#endif /* not lint */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include <err.h>
-#include <errno.h>
-#include <fts.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-u_long	string_to_flags __P((char **, u_long *, u_long *));
-void	usage __P((void));
-
-int
-main(argc, argv)
-	int argc;
-	char *argv[];
-{
-	FTS *ftsp;
-	FTSENT *p;
-	u_long clear, set;
-	long val;
-	int Hflag, Lflag, Pflag, Rflag, ch, fts_options, oct, rval;
-	char *flags, *ep;
-
-	Hflag = Lflag = Pflag = Rflag = 0;
-	while ((ch = getopt(argc, argv, "HLPR")) != EOF)
-		switch (ch) {
-		case 'H':
-			Hflag = 1;
-			Lflag = Pflag = 0;
-			break;
-		case 'L':
-			Lflag = 1;
-			Hflag = Pflag = 0;
-			break;
-		case 'P':
-			Pflag = 1;
-			Hflag = Lflag = 0;
-			break;
-		case 'R':
-			Rflag = 1;
-			break;
-		case '?':
-		default:
-			usage();
-		}
-	argv += optind;
-	argc -= optind;
-
-	if (argc < 2)
-		usage();
-
-	fts_options = FTS_PHYSICAL;
-	if (Rflag) {
-		if (Hflag)
-			fts_options |= FTS_COMFOLLOW;
-		if (Lflag) {
-			fts_options &= ~FTS_PHYSICAL;
-			fts_options |= FTS_LOGICAL;
-		}
-	}
-
-	flags = *argv;
-	if (*flags >= '0' && *flags <= '7') {
-		errno = 0;
-		val = strtol(flags, &ep, 8);
-		if (val < 0)
-			errno = ERANGE;
-		if (errno)
-                        err(1, "invalid flags: %s", flags);
-                if (*ep)
-                        errx(1, "invalid flags: %s", flags);
-		set = val;
-                oct = 1;
-	} else {
-		if (string_to_flags(&flags, &set, &clear))
-                        errx(1, "invalid flag: %s", flags);
-		clear = ~clear;
-		oct = 0;
-	}
-
-	if ((ftsp = fts_open(++argv, fts_options , 0)) == NULL)
-		err(1, NULL);
-
-	for (rval = 0; (p = fts_read(ftsp)) != NULL;) {
-		switch (p->fts_info) {
-		case FTS_D:
-			if (Rflag)		/* Change it at FTS_DP. */
-				continue;
-			fts_set(ftsp, p, FTS_SKIP);
-			break;
-		case FTS_DNR:			/* Warn, chflag, continue. */
-			warnx("%s: %s", p->fts_path, strerror(p->fts_errno));
-			rval = 1;
-			break;
-		case FTS_ERR:			/* Warn, continue. */
-		case FTS_NS:
-			warnx("%s: %s", p->fts_path, strerror(p->fts_errno));
-			rval = 1;
-			continue;
-		case FTS_SL:			/* Ignore. */
-		case FTS_SLNONE:
-			/*
-			 * The only symlinks that end up here are ones that
-			 * don't point to anything and ones that we found
-			 * doing a physical walk.
-			 */
-			continue;
-		default:
-			break;
-		}
-		if (oct) {
-			if (!chflags(p->fts_accpath, set))
-				continue;
-		} else {
-			p->fts_statp->st_flags |= set;
-			p->fts_statp->st_flags &= clear;
-			if (!chflags(p->fts_accpath, p->fts_statp->st_flags))
-				continue;
-		}
-		warn("%s", p->fts_path);
-		rval = 1;
-	}
-	if (errno)
-		err(1, "fts_read");
-	exit(rval);
-}
-
-void
-usage()
-{
-	(void)fprintf(stderr,
-	    "usage: chflags [-R [-H | -L | -P]] flags file ...\n");
-	exit(1);
-}

bin/chio/Makefile

@@ -0,0 +1,9 @@
+#	$Id: Makefile,v 1.1.1.1 1997/03/06 15:30:06 joerg Exp $
+#	@(#)Makefile	8.1 (Berkeley) 6/6/93
+
+PROG=	chio
+SRCS=	chio.c
+BINOWN=	root
+BINMODE=4555
+
+.include <bsd.prog.mk>

bin/chio/chio.1

@@ -0,0 +1,202 @@
+.\"	$NetBSD: $
+.\"
+.\" Copyright (c) 1996 Jason R. Thorpe <[email protected]>
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\" 3. All advertising materials mentioning features or use of this software
+.\"    must display the following acknowledgements:
+.\"	This product includes software developed by Jason R. Thorpe
+.\"	for And Communications, http://www.and.com/
+.\" 4. The name of the author may not be used to endorse or promote products
+.\"    derived from this software without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+.\" BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+.\" LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+.\" AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+.\" OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.Dd April 2, 1996
+.Dt CHIO 1
+.Os
+.Sh NAME
+.Nm chio
+.Nd medium changer control utility
+.Sh SYNOPSIS
+.Nm chio
+.Op Fl f Ar changer
+.Ar command
+.Ar arg1
+.Ar arg2
+.Oo
+.Ar arg3 Oo ...
+.Oc
+.Oc
+.Sh DESCRIPTION
+.Nm Chio
+is used to control the operation of medium changers, such as those found
+in tape and optical disk jukeboxes.
+.Pp
+The options are as follows:
+.Bl -tag -width indent
+.It Fl f Ar changer
+Use the device
+.Pa changer
+rather than the default device
+.Pa /dev/ch0 .
+.El
+.Pp
+The default changer may be overridden by setting the environment variable
+.Nm CHANGER
+to the desired changer device.
+.Pp
+A medium changer apparatus is made up of
+.Pa elements .
+There are four element types:
+.Pa picker
+(medium transport),
+.Pa slot
+(storage),
+.Pa portal
+(import/export), and
+.Pa drive
+(data transfer).  In this command description, the shorthand
+.Nm ET
+will be used to represent an element type, and
+.Nm EU
+will be used to represent an element unit.  For example, to represent
+the first robotic arm in the changer, the ET would be
+.Dq picker
+and the EU would be
+.Dq 0 .
+.Pp
+.Sh SUPPORTED COMMANDS
+.Nm chio move
+.Ar <from ET> <from EU> <to ET> <to EU>
+.Op Ar inv
+.Pp
+Moves the media unit from
+.Pa <from ET/EU>
+to
+.Pa <to ET/EU> .
+If the optional modifier
+.Pa inv
+is specified, the media unit will be inverted before insertion.
+.Pp
+.Nm chio exchange
+.Ar <src ET> <src EU> <dst1 ET> <dst1 EU>
+.Op Ar <dst2 ET> <dst2 ET>
+.Op Ar inv1
+.Op Ar inv2
+.Pp
+Performs a media unit exchange operation.  The media unit in
+.Pa <src ET/EU>
+is moved to
+.Pa <dst1 ET/EU>
+and the media unit previously in
+.Pa <dst1 ET/EU>
+is moved to
+.Pa <dst2 ET/EU> .
+In the case of a simple exchange,
+.Pa <dst2 ET/EU>
+is omitted and the values
+.Pa <src ET/EU>
+are used in their place.
+The optional modifiers
+.Pa inv1
+and
+.Pa inv2
+specify whether the media units are to be inverted before insertion into
+.Pa <dst1 ET/EU>
+and
+.Pa <dst2 ET/EU>
+respecitively.
+.Pp
+Note that not all medium changers support the
+.Nm exchange
+operation; The changer must have multiple free pickers or emulate
+multiple free pickers with transient storage.
+.Pp
+.Nm chio position
+.Ar <to ET> <to EU>
+.Op Ar inv
+.Pp
+Position the picker in front of the element described by
+.Pa <to ET/EU> .
+If the optional modifier
+.Pa inv
+is specified, the media unit will be inverted before insertion.
+.Pp
+Note that not all changers behave as expected when issued this command.
+.Pp
+.Nm chio params
+.Pp
+Report the number of slots, drives, pickers, and portals in the changer,
+and which picker unit the changer is currently configured to use.
+.Pp
+.Nm chio getpicker
+.Pp
+Report which picker unit the changer is currently configured to use.
+.Pp
+.Nm chio setpicker
+.Ar <unit>
+.Pp
+Configure the changer to use picker
+.Pa <unit> .
+.Pp
+.Nm chio status
+.Op Ar <type>
+.Pp
+Report the status of all elements in the changer.  If
+.Pa <type>
+is specified, report the status of all elements of type
+.Pa <type> .
+.Pp
+The status bits are defined as follows:
+.Bl -tag -width indent
+.It Nm FULL
+Element contains a media unit.
+.It Nm IMPEXP
+Media was deposited into element by an outside human operator.
+.It Nm EXCEPT
+Element is in an abnormal state.
+.It Nm ACCESS
+Media in this element is accessible by a picker.
+.It Nm EXENAB
+Element supports passing media (exporting) to an outsite human operator.
+.It Nm INENAB
+Element supports receiving media (importing) from an outside human operator.
+.El
+.Pp
+.Sh EXAMPLES
+.Nm chio move slot 3 drive 0
+.Pp
+Moves the media in slot 3 (fourth slot) to drive 0 (first drive).
+.Pp
+.Nm chio setpicker 2
+Configures the changer to use picker 2 (third picker) for operations.
+.Pp
+.Sh FILES
+/dev/ch0 - default changer device
+.Sh SEE ALSO
+.Xr mt 1 ,
+.Xr mount 8 .
+.Sh AUTHOR
+The
+.Nm chio
+program and SCSI changer driver were written by Jason R. Thorpe
+<[email protected]> for And Communications, http://www.and.com/

bin/chio/chio.c

@@ -0,0 +1,663 @@
+/*	$Id: chio.c,v 1.1.1.1 1997/03/06 15:30:06 joerg Exp $	*/
+
+/*
+ * Copyright (c) 1996 Jason R. Thorpe <[email protected]>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgements:
+ *	This product includes software developed by Jason R. Thorpe
+ *	for And Communications, http://www.and.com/
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/param.h>
+#include <sys/ioctl.h>
+#include <sys/chio.h> 
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "defs.h"
+#include "pathnames.h"
+
+extern	char *__progname;	/* from crt0.o */
+
+static	void usage __P((void));
+static	void cleanup __P((void));
+static	int parse_element_type __P((char *));
+static	int parse_element_unit __P((char *));
+static	int parse_special __P((char *));
+static	int is_special __P((char *));
+static	char *bits_to_string __P((int, const char *));
+
+static	int do_move __P((char *, int, char **));
+static	int do_exchange __P((char *, int, char **));
+static	int do_position __P((char *, int, char **));
+static	int do_params __P((char *, int, char **));
+static	int do_getpicker __P((char *, int, char **));
+static	int do_setpicker __P((char *, int, char **));
+static	int do_status __P((char *, int, char **));
+
+/* Valid changer element types. */
+const struct element_type elements[] = {
+	{ "picker",		CHET_MT },
+	{ "slot",		CHET_ST },
+	{ "portal",		CHET_IE },
+	{ "drive",		CHET_DT },
+	{ NULL,			0 },
+};
+
+/* Valid commands. */
+const struct changer_command commands[] = {
+	{ "move",		do_move },
+	{ "exchange",		do_exchange },
+	{ "position",		do_position },
+	{ "params",		do_params },
+	{ "getpicker",		do_getpicker },
+	{ "setpicker",		do_setpicker },
+	{ "status",		do_status },
+	{ NULL,			0 },
+};
+
+/* Valid special words. */
+const struct special_word specials[] = {
+	{ "inv",		SW_INVERT },
+	{ "inv1",		SW_INVERT1 },
+	{ "inv2",		SW_INVERT2 },
+	{ NULL,			0 },
+};
+
+static	int changer_fd;
+static	char *changer_name;
+
+int
+main(argc, argv)
+	int argc;
+	char **argv;
+{
+	int ch, i;
+	char *cp;
+
+	while ((ch = getopt(argc, argv, "f:")) != -1) {
+		switch (ch) {
+		case 'f':
+			changer_name = optarg;
+			break;
+
+		default:
+			usage();
+		}
+	}
+	argc -= optind;
+	argv += optind;
+
+	if (argc == 0)
+		usage();
+
+	/* Get the default changer if not already specified. */
+	if (changer_name == NULL)
+		if ((changer_name = getenv(CHANGER_ENV_VAR)) == NULL)
+			changer_name = _PATH_CH;
+
+	/* Open the changer device. */
+	if ((changer_fd = open(changer_name, O_RDWR, 0600)) == -1)
+		err(1, "%s: open", changer_name);
+
+	/* Register cleanup function. */
+	if (atexit(cleanup))
+		err(1, "can't register cleanup function");
+
+	/* Find the specified command. */
+	for (i = 0; commands[i].cc_name != NULL; ++i)
+		if (strcmp(*argv, commands[i].cc_name) == 0)
+			break;
+	if (commands[i].cc_name == NULL)
+		errx(1, "unknown command: %s", *argv);
+
+	/* Skip over the command name and call handler. */
+	++argv; --argc;
+	exit ((*commands[i].cc_handler)(commands[i].cc_name, argc, argv));
+}
+
+static int
+do_move(cname, argc, argv)
+	char *cname;
+	int argc;
+	char **argv;
+{
+	struct changer_move cmd;
+	int val;
+
+	/*
+	 * On a move command, we expect the following:
+	 *
+	 * <from ET> <from EU> <to ET> <to EU> [inv]
+	 *
+	 * where ET == element type and EU == element unit.
+	 */
+	if (argc < 4) {
+		warnx("%s: too few arguments", cname);
+		goto usage;
+	} else if (argc > 5) {
+		warnx("%s: too many arguments", cname);
+		goto usage;
+	}
+	bzero(&cmd, sizeof(cmd));
+
+	/* <from ET>  */
+	cmd.cm_fromtype = parse_element_type(*argv);
+	++argv; --argc;
+
+	/* <from EU> */
+	cmd.cm_fromunit = parse_element_unit(*argv);
+	++argv; --argc;
+
+	/* <to ET> */
+	cmd.cm_totype = parse_element_type(*argv);
+	++argv; --argc;
+
+	/* <to EU> */
+	cmd.cm_tounit = parse_element_unit(*argv);
+	++argv; --argc;
+
+	/* Deal with optional command modifier. */
+	if (argc) {
+		val = parse_special(*argv);
+		switch (val) {
+		case SW_INVERT:
+			cmd.cm_flags |= CM_INVERT;
+			break;
+
+		default:
+			errx(1, "%s: inappropriate modifier `%s'",
+			    cname, *argv);
+			/* NOTREACHED */
+		}
+	}
+
+	/* Send command to changer. */
+	if (ioctl(changer_fd, CHIOMOVE, (char *)&cmd))
+		err(1, "%s: CHIOMOVE", changer_name);
+
+	return (0);
+
+ usage:
+	fprintf(stderr, "usage: %s %s "
+	    "<from ET> <from EU> <to ET> <to EU> [inv]\n", __progname, cname);
+	return (1);
+}
+
+static int
+do_exchange(cname, argc, argv)
+	char *cname;
+	int argc;
+	char **argv;
+{
+	struct changer_exchange cmd;
+	int val;
+
+	/*
+	 * On an exchange command, we expect the following:
+	 *
+  * <src ET> <src EU> <dst1 ET> <dst1 EU> [<dst2 ET> <dst2 EU>] [inv1] [inv2]
+	 *
+	 * where ET == element type and EU == element unit.
+	 */
+	if (argc < 4) {
+		warnx("%s: too few arguments", cname);
+		goto usage;
+	} else if (argc > 8) {
+		warnx("%s: too many arguments", cname);
+		goto usage;
+	}
+	bzero(&cmd, sizeof(cmd));
+
+	/* <src ET>  */
+	cmd.ce_srctype = parse_element_type(*argv);
+	++argv; --argc;
+
+	/* <src EU> */
+	cmd.ce_srcunit = parse_element_unit(*argv);
+	++argv; --argc;
+
+	/* <dst1 ET> */
+	cmd.ce_fdsttype = parse_element_type(*argv);
+	++argv; --argc;
+
+	/* <dst1 EU> */
+	cmd.ce_fdstunit = parse_element_unit(*argv);
+	++argv; --argc;
+
+	/*
+	 * If the next token is a special word or there are no more
+	 * arguments, then this is a case of simple exchange.
+	 * dst2 == src.
+	 */
+	if ((argc == 0) || is_special(*argv)) {
+		cmd.ce_sdsttype = cmd.ce_srctype;
+		cmd.ce_sdstunit = cmd.ce_srcunit;
+		goto do_special;
+	}
+
+	/* <dst2 ET> */
+	cmd.ce_sdsttype = parse_element_type(*argv);
+	++argv; --argc;
+
+	/* <dst2 EU> */
+	cmd.ce_sdstunit = parse_element_unit(*argv);
+	++argv; --argc;
+
+ do_special:
+	/* Deal with optional command modifiers. */
+	while (argc) {
+		val = parse_special(*argv);
+		++argv; --argc;
+		switch (val) {
+		case SW_INVERT1:
+			cmd.ce_flags |= CE_INVERT1;
+			break;
+
+		case SW_INVERT2:
+			cmd.ce_flags |= CE_INVERT2;
+			break;
+
+		default:
+			errx(1, "%s: inappropriate modifier `%s'",
+			    cname, *argv);
+			/* NOTREACHED */
+		}
+	}
+
+	/* Send command to changer. */
+	if (ioctl(changer_fd, CHIOEXCHANGE, (char *)&cmd))
+		err(1, "%s: CHIOEXCHANGE", changer_name);
+
+	return (0);
+
+ usage:
+	fprintf(stderr, "usage: %s %s <src ET> <src EU> <dst1 ET> <dst1 EU>\n"
+	    "       [<dst2 ET> <dst2 EU>] [inv1] [inv2]\n",
+	    __progname, cname);
+	return (1);
+}
+
+static int
+do_position(cname, argc, argv)
+	char *cname;
+	int argc;
+	char **argv;
+{
+	struct changer_position cmd;
+	int val;
+
+	/*
+	 * On a position command, we expect the following:
+	 *
+	 * <to ET> <to EU> [inv]
+	 *
+	 * where ET == element type and EU == element unit.
+	 */
+	if (argc < 2) {
+		warnx("%s: too few arguments", cname);
+		goto usage;
+	} else if (argc > 3) {
+		warnx("%s: too many arguments", cname);
+		goto usage;
+	}
+	bzero(&cmd, sizeof(cmd));
+
+	/* <to ET>  */
+	cmd.cp_type = parse_element_type(*argv);
+	++argv; --argc;
+
+	/* <to EU> */
+	cmd.cp_unit = parse_element_unit(*argv);
+	++argv; --argc;
+
+	/* Deal with optional command modifier. */
+	if (argc) {
+		val = parse_special(*argv);
+		switch (val) {
+		case SW_INVERT:
+			cmd.cp_flags |= CP_INVERT;
+			break;
+
+		default:
+			errx(1, "%s: inappropriate modifier `%s'",
+			    cname, *argv);
+			/* NOTREACHED */
+		}
+	}
+
+	/* Send command to changer. */
+	if (ioctl(changer_fd, CHIOPOSITION, (char *)&cmd))
+		err(1, "%s: CHIOPOSITION", changer_name);
+
+	return (0);
+
+ usage:
+	fprintf(stderr, "usage: %s %s <to ET> <to EU> [inv]\n",
+	    __progname, cname);
+	return (1);
+}
+
+static int
+do_params(cname, argc, argv)
+	char *cname;
+	int argc;
+	char **argv;
+{
+	struct changer_params data;
+
+	/* No arguments to this command. */
+	if (argc) {
+		warnx("%s: no arguements expected", cname);
+		goto usage;
+	}
+
+	/* Get params from changer and display them. */
+	bzero(&data, sizeof(data));
+	if (ioctl(changer_fd, CHIOGPARAMS, (char *)&data))
+		err(1, "%s: CHIOGPARAMS", changer_name);
+
+	printf("%s: %d slot%s, %d drive%s, %d picker%s",
+	    changer_name,
+	    data.cp_nslots, (data.cp_nslots > 1) ? "s" : "",
+	    data.cp_ndrives, (data.cp_ndrives > 1) ? "s" : "",
+	    data.cp_npickers, (data.cp_npickers > 1) ? "s" : "");
+	if (data.cp_nportals)
+		printf(", %d portal%s", data.cp_nportals,
+		    (data.cp_nportals > 1) ? "s" : "");
+	printf("\n%s: current picker: %d\n", changer_name, data.cp_curpicker);
+
+	return (0);
+
+ usage:
+	fprintf(stderr, "usage: %s %s\n", __progname, cname);
+	return (1);
+}
+
+static int
+do_getpicker(cname, argc, argv)
+	char *cname;
+	int argc;
+	char **argv;
+{
+	int picker;
+
+	/* No arguments to this command. */
+	if (argc) {
+		warnx("%s: no arguments expected", cname);
+		goto usage;
+	}
+
+	/* Get current picker from changer and display it. */
+	if (ioctl(changer_fd, CHIOGPICKER, (char *)&picker))
+		err(1, "%s: CHIOGPICKER", changer_name);
+
+	printf("%s: current picker: %d\n", changer_name, picker);
+
+	return (0);
+
+ usage:
+	fprintf(stderr, "usage: %s %s\n", __progname, cname);
+	return (1);
+}
+
+static int
+do_setpicker(cname, argc, argv)
+	char *cname;
+	int argc;
+	char **argv;
+{
+	int picker;
+
+	if (argc < 1) {
+		warnx("%s: too few arguments", cname);
+		goto usage;
+	} else if (argc > 1) {
+		warnx("%s: too many arguments", cname);
+		goto usage;
+	}
+
+	picker = parse_element_unit(*argv);
+
+	/* Set the changer picker. */
+	if (ioctl(changer_fd, CHIOSPICKER, (char *)&picker))
+		err(1, "%s: CHIOSPICKER", changer_name);
+
+	return (0);
+
+ usage:
+	fprintf(stderr, "usage: %s %s <picker>\n", __progname, cname);
+	return (1);
+}
+
+static int
+do_status(cname, argc, argv)
+	char *cname;
+	int argc;
+	char **argv;
+{
+	struct changer_element_status cmd;
+	struct changer_params data;
+	u_int8_t *statusp;
+	int i, count, chet, schet, echet;
+	char *cmdname, *description;
+
+	/*
+	 * On a status command, we expect the following:
+	 *
+	 * [<ET>]
+	 *
+	 * where ET == element type.
+	 *
+	 * If we get no arguments, we get the status of all
+	 * known element types.
+	 */
+	if (argc > 1) {
+		warnx("%s: too many arguments", cname);
+		goto usage;
+	}
+
+	/*
+	 * Get params from changer.  Specifically, we need the element
+	 * counts.
+	 */
+	bzero(&data, sizeof(data));
+	if (ioctl(changer_fd, CHIOGPARAMS, (char *)&data))
+		err(1, "%s: CHIOGPARAMS", changer_name);
+
+	if (argc)
+		schet = echet = parse_element_type(*argv);
+	else {
+		schet = CHET_MT;
+		echet = CHET_DT;
+	}
+
+	for (chet = schet; chet <= echet; ++chet) {
+		switch (chet) {
+		case CHET_MT:
+			count = data.cp_npickers;
+			description = "picker";
+			break;
+
+		case CHET_ST:
+			count = data.cp_nslots;
+			description = "slot";
+			break;
+
+		case CHET_IE:
+			count = data.cp_nportals;
+			description = "portal";
+			break;
+
+		case CHET_DT:
+			count = data.cp_ndrives;
+			description = "drive";
+			break;
+		}
+
+		if (count == 0) {
+			if (argc == 0)
+				continue;
+			else {
+				printf("%s: no %s elements\n",
+				    changer_name, description);
+				return (0);
+			}
+		}
+
+		/* Allocate storage for the status bytes. */
+		if ((statusp = (u_int8_t *)malloc(count)) == NULL)
+			errx(1, "can't allocate status storage");
+
+		bzero(statusp, count);
+		bzero(&cmd, sizeof(cmd));
+
+		cmd.ces_type = chet;
+		cmd.ces_data = statusp;
+
+		if (ioctl(changer_fd, CHIOGSTATUS, (char *)&cmd)) {
+			free(statusp);
+			err(1, "%s: CHIOGSTATUS", changer_name);
+		}
+
+		/* Dump the status for each element of this type. */
+		for (i = 0; i < count; ++i) {
+			printf("%s %d: %s\n", description, i,
+			    bits_to_string(statusp[i], CESTATUS_BITS));
+		}
+
+		free(statusp);
+	}
+
+	return (0);
+
+ usage:
+	fprintf(stderr, "usage: %s %s [<element type>]\n", __progname,
+	    cname);
+	return (1);
+}
+
+static int
+parse_element_type(cp)
+	char *cp;
+{
+	int i;
+
+	for (i = 0; elements[i].et_name != NULL; ++i)
+		if (strcmp(elements[i].et_name, cp) == 0)
+			return (elements[i].et_type);
+
+	errx(1, "invalid element type `%s'", cp);
+}
+
+static int
+parse_element_unit(cp)
+	char *cp;
+{
+	int i;
+	char *p;
+
+	i = (int)strtol(cp, &p, 10);
+	if ((i < 0) || (*p != '\0'))
+		errx(1, "invalid unit number `%s'", cp);
+
+	return (i);
+}
+
+static int
+parse_special(cp)
+	char *cp;
+{
+	int val;
+
+	val = is_special(cp);
+	if (val)
+		return (val);
+
+	errx(1, "invalid modifier `%s'", cp);
+}
+
+static int
+is_special(cp)
+	char *cp;
+{
+	int i;
+
+	for (i = 0; specials[i].sw_name != NULL; ++i)
+		if (strcmp(specials[i].sw_name, cp) == 0)
+			return (specials[i].sw_value);
+
+	return (0);
+}
+
+static char *
+bits_to_string(v, cp)
+	int v;
+	const char *cp;
+{
+	const char *np;
+	char f, sep, *bp;
+	static char buf[128];
+
+	bp = buf;
+	bzero(buf, sizeof(buf));
+
+	for (sep = '<'; (f = *cp++) != 0; cp = np) {
+		for (np = cp; *np >= ' ';)
+			np++;
+		if ((v & (1 << (f - 1))) == 0)
+			continue;
+		bp += sprintf(bp, "%c%.*s", sep, np - cp, cp);
+		sep = ',';
+	}
+	if (sep != '<')
+		*bp = '>';
+
+	return (buf);
+}
+
+static void
+cleanup()
+{
+
+	/* Simple enough... */
+	(void)close(changer_fd);
+}
+
+static void
+usage()
+{
+
+	fprintf(stderr, "usage: %s command arg1 arg2 ...\n", __progname);
+	exit(1);
+}

bin/chio/defs.h

@@ -0,0 +1,57 @@
+/*	$Id: defs.h,v 1.1.1.1 1997/03/06 15:30:06 joerg Exp $	*/
+
+/*
+ * Copyright (c) 1996 Jason R. Thorpe <[email protected]>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgements:
+ *	This product includes software developed by Jason R. Thorpe
+ *	for And Communications, http://www.and.com/
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+struct element_type {
+	char	*et_name;	/* name; i.e. "picker, "slot", etc. */
+	int	et_type;	/* type number */
+};
+
+struct changer_command {
+	char	*cc_name;	/* command name */
+				/* command handler */
+	int	(*cc_handler) __P((char *, int, char **));
+};
+
+struct special_word {
+	char	*sw_name;	/* special word */
+	int	sw_value;	/* token value */
+};
+
+/* sw_value */
+#define SW_INVERT	1	/* set "invert media" flag */
+#define SW_INVERT1	2	/* set "invert media 1" flag */
+#define SW_INVERT2	3	/* set "invert media 2" flag */
+
+/* Environment variable to check for default changer. */
+#define CHANGER_ENV_VAR		"CHANGER"

bin/chio/pathnames.h

@@ -0,0 +1,35 @@
+/*	$Id: pathnames.h,v 1.1.1.1 1997/03/06 15:30:06 joerg Exp $	*/
+
+/*
+ * Copyright (c) 1996 Jason R. Thorpe <[email protected]>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgements:
+ *	This product includes software developed by Jason R. Thorpe
+ *	for And Communications, http://www.and.com/
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#define _PATH_CH	"/dev/ch0"

bin/chmod/Makefile

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+#	$Id: Makefile,v 1.2 1994/09/24 02:53:36 davidg Exp $
 
 PROG=	chmod
 

bin/chmod/chmod.1

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)chmod.1	8.4 (Berkeley) 3/31/94
-.\"	$Id: chmod.1,v 1.3 1996/02/16 00:08:53 joerg Exp $
+.\"	$Id: chmod.1,v 1.4.2.1 1997/02/28 07:54:25 mpp Exp $
 .\"
 .Dd March 31, 1994
 .Dt CHMOD 1
@@ -286,7 +286,8 @@ option for the naughty bits.
 .Sh STANDARDS
 The
 .Nm chmod
-utility is expected to be POSIX 1003.2
+utility is expected to be
+.St -p1003.2
 compatible with the exception of the
 .Ar perm
 symbols

bin/chmod/chmod.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: chmod.c,v 1.4 1995/03/19 13:27:43 joerg Exp $
+ *	$Id: chmod.c,v 1.5 1996/08/10 15:05:26 adam Exp $
  */
 
 #ifndef lint

bin/cp/Makefile

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+#	$Id: Makefile,v 1.2 1994/09/24 02:53:39 davidg Exp $
 
 PROG=	cp
 SRCS=	cp.c utils.c

bin/cp/cp.1

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)cp.1	8.3 (Berkeley) 4/18/94
-.\"	$Id: cp.1,v 1.5 1996/03/08 06:58:05 wosch Exp $
+.\"	$Id: cp.1,v 1.6.2.1 1997/02/28 07:54:27 mpp Exp $
 .\"
 .Dd April 18, 1994
 .Dt CP 1
@@ -213,7 +213,7 @@ or fifo's.
 .Xr umask 2 , 
 .Xr fts 3 ,
 .Xr symlink 7
-.Sh HISTORY
+.Sh STANDARDS
 The
 .Nm cp
 command is expected to be

bin/cp/cp.c

@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cp.c,v 1.9 1996/02/19 05:56:33 pst Exp $
+ *	$Id: cp.c,v 1.10 1996/03/08 06:58:06 wosch Exp $
  */
 
 #ifndef lint

bin/cp/extern.h

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.2 (Berkeley) 4/1/94
- *	$Id: extern.h,v 1.3 1996/02/18 18:48:26 wosch Exp $
+ *	$Id: extern.h,v 1.5 1996/03/08 06:58:07 wosch Exp $
  */
 
 typedef struct {

bin/cp/utils.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: utils.c,v 1.6 1996/02/18 18:48:26 wosch Exp wosch $
+ *	$Id: utils.c,v 1.9 1996/03/08 06:58:08 wosch Exp $
  */
 
 #ifndef lint

bin/csh/Makefile

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+#	$Id: Makefile,v 1.5 1994/09/24 02:53:44 davidg Exp $
 #
 # C Shell with process control; VM/UNIX VAX Makefile
 # Bill Joy UC Berkeley; Jim Kulp IIASA, Austria

bin/csh/USD.doc/Makefile

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 8/14/93
-#	$Id$
+#	$Id: Makefile,v 1.2 1994/09/24 02:54:22 davidg Exp $
 
 DIR=	usd/04.csh
 SRCS=	tabs csh.1 csh.2 csh.3 csh.4 csh.a csh.g

bin/csh/USD.doc/csh.1

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.1	8.1 (Berkeley) 6/8/93
-.\"	$Id: csh.1,v 1.2 1994/09/24 02:54:23 davidg Exp $
+.\"	$Id: csh.1,v 1.3 1996/10/05 22:25:45 wosch Exp $
 .\"
 .EH 'USD:4-%''An Introduction to the C shell'
 .OH 'An Introduction to the C shell''USD:4-%'

bin/csh/USD.doc/csh.2

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.2	8.1 (Berkeley) 6/8/93
-.\"	$Id: csh.2,v 1.2 1994/09/24 02:54:24 davidg Exp $
+.\"	$Id: csh.2,v 1.3 1996/10/05 22:25:46 wosch Exp $
 .\"
 .nr H1 1
 .NH

bin/csh/USD.doc/csh.3

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.3	8.1 (Berkeley) 6/8/93
-.\"	$Id$
+.\"	$Id: csh.3,v 1.2 1994/09/24 02:54:26 davidg Exp $
 .\"
 .nr H1 2
 .NH

bin/csh/USD.doc/csh.4

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.4	8.1 (Berkeley) 6/8/93
-.\"	$Id$
+.\"	$Id: csh.4,v 1.2 1994/09/24 02:54:27 davidg Exp $
 .\"
 .nr H1 3
 .NH

bin/csh/USD.doc/csh.a

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.a	8.1 (Berkeley) 6/8/93
-.\"	$Id$
+.\"	$Id: csh.a,v 1.2 1994/09/24 02:54:28 davidg Exp $
 .\"
 .SH
 Appendix \- Special characters

bin/csh/USD.doc/csh.g

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.g	8.1 (Berkeley) 6/8/93
-.\"	$Id$
+.\"	$Id: csh.g,v 1.2 1994/09/24 02:54:31 davidg Exp $
 .\"
 .SH
 Glossary

bin/csh/USD.doc/tabs

@@ -30,6 +30,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tabs	8.1 (Berkeley) 6/8/93
-.\"	$Id$
+.\"	$Id: tabs,v 1.2 1994/09/24 02:54:32 davidg Exp $
 .\"
 .ta 5n 10n 15n 20n 25n 30n 35n 40n 45n 50n 55n 60n 65n 70n 75n 80n

bin/csh/alloc.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: alloc.c,v 1.3 1995/03/19 13:28:10 joerg Exp $
+ *	$Id: alloc.c,v 1.4 1995/05/30 00:06:28 rgrimes Exp $
  */
 
 #ifndef lint

bin/csh/char.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: char.c,v 1.2 1994/09/24 02:53:46 davidg Exp $
  */
 
 #ifndef lint

bin/csh/char.h

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)char.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: char.h,v 1.2 1994/09/24 02:53:47 davidg Exp $
  */
 
 #include <ctype.h>

bin/csh/const.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: const.c,v 1.3 1995/05/30 00:06:29 rgrimes Exp $
+ *	$Id: const.c,v 1.4 1995/10/23 23:08:24 ache Exp $
  */
 
 #ifndef lint

bin/csh/csh.1

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)csh.1	8.2 (Berkeley) 1/21/94
-.\"	$Id: csh.1,v 1.4 1996/04/06 09:47:15 mpp Exp $
+.\"	$Id: csh.1,v 1.5.2.1 1997/02/28 07:54:29 mpp Exp $
 .\"
 .Dd January 21, 1994
 .Dt CSH 1
@@ -2121,13 +2121,13 @@ substitutions on a single line to 20.
 .Xr fork 2 ,
 .Xr killpg 2 ,
 .Xr pipe 2 ,
+.Xr setrlimit 2 ,
 .Xr sigvec 2 ,
 .Xr umask 2 ,
-.Xr setrlimit 2 ,
 .Xr wait 2 ,
 .Xr tty 4 ,
 .Xr a.out 5 ,
-.Xr environ 7 ,
+.Xr environ 7
 .br
 .Em An introduction to the C shell
 .Sh HISTORY

bin/csh/csh.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: csh.c,v 1.5 1995/07/07 23:14:36 ache Exp $
+ *	$Id: csh.c,v 1.6 1995/10/23 23:08:25 ache Exp $
  */
 
 #ifndef lint

bin/csh/csh.h

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)csh.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: csh.h,v 1.2 1994/09/24 02:53:52 davidg Exp $
  */
 
 /*

bin/csh/dir.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: dir.c,v 1.3 1995/05/30 00:06:30 rgrimes Exp $
+ *	$Id: dir.c,v 1.4 1995/06/18 14:34:48 ache Exp $
  */
 
 #ifndef lint

bin/csh/dir.h

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dir.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: dir.h,v 1.2 1994/09/24 02:53:55 davidg Exp $
  */
 
 /*

bin/csh/dol.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: dol.c,v 1.2 1994/09/24 02:53:56 davidg Exp $
+ *	$Id: dol.c,v 1.3 1995/05/30 00:06:31 rgrimes Exp $
  */
 
 #ifndef lint

bin/csh/err.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: err.c,v 1.2 1994/09/24 02:53:57 davidg Exp $
  */
 
 #ifndef lint

bin/csh/exec.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: exec.c,v 1.3 1995/05/30 00:06:32 rgrimes Exp $
+ *	$Id: exec.c,v 1.4 1995/06/18 14:20:16 ache Exp $
  */
 
 #ifndef lint

bin/csh/exp.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: exp.c,v 1.2 1994/09/24 02:54:00 davidg Exp $
  */
 
 #ifndef lint

bin/csh/extern.h

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: extern.h,v 1.2 1994/09/24 02:54:02 davidg Exp $
  */
 
 #include <sys/cdefs.h>

bin/csh/file.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: file.c,v 1.3 1995/05/30 00:06:33 rgrimes Exp $
+ *	$Id: file.c,v 1.4 1995/06/18 14:08:44 ache Exp $
  */
 
 #ifndef lint

bin/csh/func.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: func.c,v 1.4 1995/10/23 23:08:26 ache Exp $
+ *	$Id: func.c,v 1.5 1996/08/11 23:10:38 ache Exp $
  */
 
 #ifndef lint

bin/csh/glob.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: glob.c,v 1.5 1996/08/12 21:32:15 ache Exp $
+ *	$Id: glob.c,v 1.6 1996/10/31 07:22:48 ache Exp $
  */
 
 #ifndef lint

bin/csh/hist.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: hist.c,v 1.2 1994/09/24 02:54:06 davidg Exp $
  */
 
 #ifndef lint

bin/csh/init.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: init.c,v 1.2 1994/09/24 02:54:07 davidg Exp $
  */
 
 #ifndef lint

bin/csh/lex.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: lex.c,v 1.3 1995/05/30 00:06:35 rgrimes Exp $
+ *	$Id: lex.c,v 1.4 1995/08/10 05:13:42 ache Exp $
  */
 
 #ifndef lint

bin/csh/misc.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: misc.c,v 1.2 1994/09/24 02:54:10 davidg Exp $
+ *	$Id: misc.c,v 1.3 1996/09/28 14:32:01 bde Exp $
  */
 
 #ifndef lint

bin/csh/parse.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: parse.c,v 1.2 1994/09/24 02:54:11 davidg Exp $
+ *	$Id: parse.c,v 1.3 1995/05/30 00:06:37 rgrimes Exp $
  */
 
 #ifndef lint

bin/csh/pathnames.h

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: pathnames.h,v 1.2 1994/09/24 02:54:12 davidg Exp $
  */
 
 #define	_PATH_BIN		"/bin"

bin/csh/proc.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: proc.c,v 1.2 1994/09/24 02:54:13 davidg Exp $
  */
 
 #ifndef lint

bin/csh/proc.h

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)proc.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: proc.h,v 1.2 1994/09/24 02:54:14 davidg Exp $
  */
 
 /*

bin/csh/sem.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sem.c,v 1.2 1994/09/24 02:54:15 davidg Exp $
+ *	$Id: sem.c,v 1.3 1995/05/30 00:06:37 rgrimes Exp $
  */
 
 #ifndef lint

bin/csh/set.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: set.c,v 1.3 1995/05/30 00:06:38 rgrimes Exp $
+ *	$Id: set.c,v 1.4 1995/07/07 23:13:11 ache Exp $
  */
 
 #ifndef lint

bin/csh/str.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: str.c,v 1.2 1994/09/24 02:54:18 davidg Exp $
+ *	$Id: str.c,v 1.3 1995/05/30 00:06:39 rgrimes Exp $
  */
 
 #ifndef lint

bin/csh/time.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: time.c,v 1.4 1995/03/19 13:28:12 joerg Exp $
+ *	$Id: time.c,v 1.5 1995/05/30 00:06:40 rgrimes Exp $
  */
 
 #ifndef lint

bin/date/Makefile

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+#	$Id: Makefile,v 1.2 1994/09/24 02:54:33 davidg Exp $
 
 PROG=	date
 SRCS=	date.c netdate.c

bin/date/date.1

@@ -32,8 +32,8 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     @(#)date.1	8.2 (Berkeley) 11/17/93
-.\"	$Id: date.1,v 1.7 1996/03/12 05:30:39 nate Exp $
+.\"     @(#)date.1	8.3 (Berkeley) 4/28/95
+.\"	$Id: date.1,v 1.8.2.1 1997/02/28 07:54:32 mpp Exp $
 .\"
 .Dd November 17, 1993
 .Dt DATE 1
@@ -50,7 +50,7 @@
 .Op Cm + Ns Ar format
 .Op [yy[mm[dd[hh]]]]mm[\&.ss]
 .Sh DESCRIPTION
-.Nm Date
+.Nm
 displays the current date and time when invoked without arguments.
 Providing arguments will format the date and time in a user-defined
 way or set the date.
@@ -105,9 +105,11 @@ The format string may contain any of the conversion specifications described
 in the 
 .Xr strftime 3
 manual page, as well as any arbitrary text.
+A <newline> character is always output after the characters specified by
+the format string.
 The format string for the default display is:
 .Bd -literal -offset indent
-``%+''.
+``+%+''
 .Ed
 .Pp
 If an operand does not have a leading plus sign, it is interpreted as
@@ -137,7 +139,7 @@ and years are handled automatically.
 .Sh EXAMPLES
 The command:
 .Bd -literal -offset indent
-date ``+DATE: %m/%d/%y%nTIME: %H:%M:%S%n''
+date ``+DATE: %m/%d/%y%nTIME: %H:%M:%S''
 .Ed
 .Pp
 will display:
@@ -162,9 +164,10 @@ date 1432
 sets the time to
 .Li "2:32 PM" ,
 without modifying the date.
-.Sh ENVIRONMENTAL VARIABLES
-The following environment variables affect the execution of
-.Nm date :
+.Sh ENVIRONMENT VARIABLES
+The execution of
+.Nm
+is affected by the following evironment variables:
 .Bl -tag -width Ds
 .It Ev TZ
 The timezone to use when displaying dates.

bin/date/date.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: date.c,v 1.6 1995/10/23 20:26:53 ache Exp $
+ *	$Id: date.c,v 1.7 1996/04/06 01:42:09 ache Exp $
  */
 
 #ifndef lint

bin/date/extern.h

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: extern.h,v 1.2 1994/09/24 02:54:37 davidg Exp $
  */
 
 int	netsettime __P((time_t));

bin/date/netdate.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: netdate.c,v 1.2 1994/09/24 02:54:38 davidg Exp $
+ *	$Id: netdate.c,v 1.3.6.1 1997/03/10 19:51:16 guido Exp $
  */
 
 #ifndef lint
@@ -116,7 +116,8 @@ netsettime(tval)
 		warn("gethostname");
 		goto bad;
 	}
-	(void)strncpy(msg.tsp_name, hostname, sizeof(hostname));
+	(void)strncpy(msg.tsp_name, hostname, sizeof(msg.tsp_name));
+	msg.tsp_name[sizeof(msg.tsp_name) - 1] = '\0';
 	msg.tsp_seq = htons((u_short)0);
 	msg.tsp_time.tv_sec = htonl((u_long)tval);
 	msg.tsp_time.tv_usec = htonl((u_long)0);

bin/dd/Makefile

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+#	$Id: Makefile,v 1.2 1994/09/24 02:54:40 davidg Exp $
 
 PROG=	dd
 SRCS=	args.c conv.c conv_tab.c dd.c misc.c position.c

bin/dd/args.c

@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: args.c,v 1.3.8.1 1996/11/21 16:30:28 phk Exp $
  */
 
 #ifndef lint
@@ -100,7 +100,7 @@ jcl(argv)
 
 	in.dbsz = out.dbsz = 512;
 
-	while ((oper = *++argv)) {/* JEAG */
+	while ((oper = *++argv) != NULL) {
 		if ((arg = strchr(oper, '=')) == NULL)
 			errx(1, "unknown operand %s", oper);
 		*arg++ = '\0';

bin/dd/conv.c

@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: conv.c,v 1.3.8.1 1996/11/21 16:30:30 phk Exp $
  */
 
 #ifndef lint
@@ -61,7 +61,7 @@ def()
 	int cnt;
 	u_char *inp, *t;
 
-	if ((t = ctab))
+	if ((t = ctab) != NULL)
 		for (inp = in.dbp - (cnt = in.dbrcnt); cnt--; ++inp)
 			*inp = t[*inp];
 
@@ -105,7 +105,6 @@ block()
 	int ch, cnt, maxlen;
 	u_char *inp, *outp, *t;
 
-        ch = 0;
 	/*
 	 * Record truncation can cross block boundaries.  If currently in a
 	 * truncation state, keep tossing characters until reach a newline.
@@ -130,9 +129,10 @@ block()
 	 * Copy records (max cbsz size chunks) into the output buffer.  The
 	 * translation is done as we copy into the output buffer.
 	 */
+	ch = 0;			/* Help the compiler. */
 	for (inp = in.dbp - in.dbcnt, outp = out.dbp; in.dbcnt;) {
 		maxlen = MIN(cbsz, in.dbcnt);
-		if ((t = ctab))
+		if ((t = ctab) != NULL)
 			for (cnt = 0;
 			    cnt < maxlen && (ch = *inp++) != '\n'; ++cnt)
 				*outp++ = t[ch];
@@ -216,7 +216,7 @@ unblock()
 	u_char *inp, *t;
 
 	/* Translation and case conversion. */
-	if ((t = ctab))
+	if ((t = ctab) != NULL)
 		for (cnt = in.dbrcnt, inp = in.dbp; cnt--;)
 			*--inp = t[*inp];
 	/*

bin/dd/conv_tab.c

@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: conv_tab.c,v 1.2 1994/09/24 02:54:47 davidg Exp $
+ *	$Id: conv_tab.c,v 1.3 1995/01/17 23:04:28 ache Exp $
  */
 
 #ifndef lint

bin/dd/dd.1

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dd.1	8.2 (Berkeley) 1/13/94
-.\"	$Id$
+.\"	$Id: dd.1,v 1.2.8.1 1997/02/28 07:54:33 mpp Exp $
 .\"
 .Dd January 13, 1994
 .Dt DD 1

bin/dd/dd.c

@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: dd.c,v 1.4 1995/01/17 23:04:29 ache Exp $
+ *	$Id: dd.c,v 1.5.2.1 1996/11/21 16:30:32 phk Exp $
  */
 
 #ifndef lint
@@ -56,12 +56,12 @@ static char sccsid[] = "@(#)dd.c	8.5 (Berkeley) 4/2/94";
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <locale.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <locale.h>
 
 #include "dd.h"
 #include "extern.h"
@@ -85,7 +85,7 @@ main(argc, argv)
 	int argc;
 	char *argv[];
 {
-	(void) setlocale(LC_CTYPE, "");
+	(void)setlocale(LC_CTYPE, "");
 	jcl(argv);
 	setup();
 
@@ -105,6 +105,7 @@ static void
 setup()
 {
 	u_int cnt;
+	struct timeval tv;
 
 	if (in.name == NULL) {
 		in.name = "stdin";
@@ -213,7 +214,8 @@ setup()
 						ctab[cnt] = cnt;
 			}
 		}
-	(void)time(&st.start);			/* Statistics timestamp. */
+	(void)gettimeofday(&tv, (struct timezone *)NULL);
+	st.start = tv.tv_sec + tv.tv_usec * 1e-6; 
 }
 
 static void

bin/dd/dd.h

@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dd.h	8.3 (Berkeley) 4/2/94
- *	$Id$
+ *	$Id: dd.h,v 1.2.8.1 1996/11/21 16:30:33 phk Exp $
  */
 
 /* Input/output stream state. */
@@ -70,7 +70,7 @@ typedef struct {
 	u_long	trunc;			/* # of truncated records */
 	u_long	swab;			/* # of odd-length swab blocks */
 	u_long	bytes;			/* # of bytes written */
-	time_t	start;			/* start time of dd */
+	double	start; 			/* start time of dd */
 } STAT;
 
 /* Flags (in ddflags). */

bin/dd/extern.h

@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.3 (Berkeley) 4/2/94
- *	$Id$
+ *	$Id: extern.h,v 1.2 1994/09/24 02:54:57 davidg Exp $
  */
 
 #include <sys/cdefs.h>

bin/dd/misc.c

@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: misc.c,v 1.2.8.1 1996/11/21 16:30:35 phk Exp $
  */
 
 #ifndef lint
@@ -42,6 +42,7 @@ static char sccsid[] = "@(#)misc.c	8.3 (Berkeley) 4/2/94";
 #endif /* not lint */
 
 #include <sys/types.h>
+#include <sys/time.h>
 
 #include <err.h>
 #include <stdio.h>
@@ -56,12 +57,14 @@ static char sccsid[] = "@(#)misc.c	8.3 (Berkeley) 4/2/94";
 void
 summary()
 {
-	time_t secs;
+	struct timeval tv;
+	double secs;
 	char buf[100];
 
-	(void)time(&secs);
-	if ((secs -= st.start) == 0)
-		secs = 1;
+	(void)gettimeofday(&tv, (struct timezone *)NULL);
+	secs = tv.tv_sec + tv.tv_usec * 1e-6 - st.start;
+	if (secs < 1e-6)
+		secs = 1e-6;
 	/* Use snprintf(3) so that we don't reenter stdio(3). */
 	(void)snprintf(buf, sizeof(buf),
 	    "%u+%u records in\n%u+%u records out\n",
@@ -78,7 +81,7 @@ summary()
 		(void)write(STDERR_FILENO, buf, strlen(buf));
 	}
 	(void)snprintf(buf, sizeof(buf),
-	    "%u bytes transferred in %u secs (%u bytes/sec)\n",
+	    "%u bytes transferred in %.6f secs (%.0f bytes/sec)\n",
 	    st.bytes, secs, st.bytes / secs);
 	(void)write(STDERR_FILENO, buf, strlen(buf));
 }

bin/dd/position.c

@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: position.c,v 1.2 1994/09/24 02:55:03 davidg Exp $
  */
 
 #ifndef lint

bin/df/Makefile

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/1/94
-#	$Id$
+#	$Id: Makefile,v 1.2 1994/09/24 02:55:06 davidg Exp $
 
 PROG=	df
 BINGRP=	operator

bin/df/df.1

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)df.1	8.2 (Berkeley) 1/13/94
-.\"	$Id: df.1,v 1.3 1994/09/24 02:55:08 davidg Exp $
+.\"	$Id: df.1,v 1.4.2.1 1996/12/13 17:15:10 joerg Exp $
 .\"
 .Dd January 13, 1994
 .Dt DF 1
@@ -78,11 +78,14 @@ with the possibly stale statistics that were previously obtained.
 .It Fl t
 Only print out statistics for filesystems of the specified types.
 The recognized types are:
-ufs, nfs, mfs, lfs, msdos, fdesc, portal, kernfs, procfs, afs and isofs.
+ufs, nfs, mfs, lfs, msdos, fdesc, portal, kernfs, procfs, afs, isofs,
+iso9660fs, cdfs, and cd9660,
 along with the aggregates:
 all (the default),
-local (ufs, mfs, lfs, msdos, isofs),
+local (ufs, mfs, lfs, msdos, cd9660),
 and misc (fdesc, portal, kernfs, procfs).
+The names isofs, iso9660fs, cdfs, and cd9660 are aliases to each other
+all of them refering to the same type of file system.
 The string ``no'' may be prepending to a type to get its complement
 (e.g. ``nonfs'' to get non-NFS filesystems).  The first
 .Fl t

bin/df/df.c

@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: df.c,v 1.7 1995/05/30 00:06:42 rgrimes Exp $
+ *	$Id: df.c,v 1.8.2.1 1996/12/13 17:15:11 joerg Exp $
  */
 
 #ifndef lint
@@ -95,6 +95,8 @@ struct typetab {
 	{"procfs",	MT(MOUNT_PROCFS)},
 	{"afs",		MT(MOUNT_AFS)},
 	{"iso9660fs",	MT(MOUNT_CD9660)},
+	{"isofs",	MT(MOUNT_CD9660)},
+	{"cd9660",	MT(MOUNT_CD9660)},
 	{"cdfs",	MT(MOUNT_CD9660)},
 	{"misc",	MT(MOUNT_LOFS)|MT(MOUNT_FDESC)|MT(MOUNT_PORTAL)|
 			MT(MOUNT_KERNFS)|MT(MOUNT_PROCFS)},

bin/domainname/Makefile

@@ -1,4 +1,4 @@
-#	$Id$
+#	$Id: Makefile,v 1.1 1994/09/18 21:23:35 wollman Exp $
 
 PROG=	domainname
 

bin/domainname/domainname.1

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)hostname.1	8.1 (Berkeley) 5/31/93
-.\"	$Id: domainname.1,v 1.1 1994/09/18 21:23:36 wollman Exp $
+.\"	$Id: domainname.1,v 1.2 1995/01/14 17:02:33 ats Exp $
 .\"
 .Dd September 18, 1994
 .Dt DOMAINNAME 1

bin/domainname/domainname.c

@@ -40,7 +40,7 @@ static char copyright[] =
 #ifndef lint
 /*static char sccsid[] = "From: @(#)hostname.c	8.1 (Berkeley) 5/31/93"; */
 static const char rcsid[] =
-	"$Id: domainname.c,v 1.4 1994/09/26 02:14:27 wollman Exp $";
+	"$Id: domainname.c,v 1.5 1995/03/19 13:28:17 joerg Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>

bin/echo/Makefile

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+#	$Id: Makefile,v 1.2 1994/09/24 02:55:15 davidg Exp $
 
 PROG=	echo
 

bin/echo/echo.1

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)echo.1	8.1 (Berkeley) 7/22/93
-.\"	$Id: echo.1,v 1.2 1994/09/24 02:55:17 davidg Exp $
+.\"	$Id: echo.1,v 1.3 1995/08/31 17:25:54 jkh Exp $
 .\"
 .Dd July 22, 1993
 .Dt ECHO 1

bin/echo/echo.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: echo.c,v 1.2 1994/09/24 02:55:18 davidg Exp $
+ *	$Id: echo.c,v 1.3 1995/08/31 17:25:55 jkh Exp $
  */
 
 #ifndef lint

bin/ed/Makefile

@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.12 1995/10/03 15:44:50 markm Exp $
+#	$Id: Makefile,v 1.13 1995/10/22 20:14:13 ache Exp $
 
 PROG=	ed
 SRCS=	buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c

bin/ed/POSIX

@@ -1,4 +1,4 @@
-$Id$
+$Id: POSIX,v 1.4 1994/09/24 02:55:20 davidg Exp $
 
 This version of ed(1) is not strictly POSIX compliant, as described in
 the POSIX 1003.2 document.  The following is a summary of the omissions,

bin/ed/README

@@ -1,4 +1,4 @@
-$Id$
+$Id: README,v 1.4 1994/09/24 02:55:21 davidg Exp $
 
 ed is an 8-bit-clean, POSIX-compliant line editor.  It should work with
 any regular expression package that conforms to the POSIX interface

bin/ed/buf.c

@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: buf.c,v 1.6 1994/09/24 02:55:22 davidg Exp $
+ *	$Id: buf.c,v 1.7 1995/05/30 00:06:43 rgrimes Exp $
  */
 #ifndef lint
 static char *rcsid = "@(#)buf.c,v 1.4 1994/02/01 00:34:35 alm Exp";

bin/ed/cbc.c

@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)bdes.c	5.5 (Berkeley) 6/27/91
- *	$Id: cbc.c,v 1.5 1995/03/19 13:28:24 joerg Exp $
+ *	$Id: cbc.c,v 1.6 1996/08/11 16:48:11 ache Exp $
  */
 
 #ifndef lint

bin/ed/ed.1

@@ -1,4 +1,4 @@
-.\"	$Id: ed.1,v 1.7 1996/08/29 18:05:50 wosch Exp $
+.\"	$Id: ed.1,v 1.8 1996/10/05 22:26:02 wosch Exp $
 .TH ED 1 "21 May 1993"
 .SH NAME
 .\" ed, red \- text editor

bin/ed/ed.h

@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ed.h,v 1.5 1994/02/01 00:34:39 alm Exp
- *	$Id: ed.h,v 1.7 1994/09/24 02:55:25 davidg Exp $
+ *	$Id: ed.h,v 1.8 1994/11/03 21:46:55 davidg Exp $
  */
 
 #include <sys/types.h>

bin/ed/glbl.c

@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: glbl.c,v 1.3 1995/03/19 13:28:27 joerg Exp $
+ *	$Id: glbl.c,v 1.4 1995/05/30 00:06:46 rgrimes Exp $
  */
 
 #ifndef lint

bin/ed/io.c

@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: io.c,v 1.4 1995/03/19 13:28:32 joerg Exp $
+ *	$Id: io.c,v 1.5 1996/05/23 06:36:34 tg Exp $
  */
 
 #ifndef lint

bin/ed/main.c

@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: main.c,v 1.5 1995/05/30 00:06:47 rgrimes Exp $
+ *	$Id: main.c,v 1.6 1996/08/11 16:48:11 ache Exp $
  */
 
 #ifndef lint

bin/ed/re.c

@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: re.c,v 1.9 1995/03/19 13:28:36 joerg Exp $
+ *	$Id: re.c,v 1.10 1995/05/30 00:06:47 rgrimes Exp $
  */
 
 #ifndef lint

bin/ed/sub.c

@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sub.c,v 1.5 1995/03/19 13:28:38 joerg Exp $
+ *	$Id: sub.c,v 1.6 1995/05/30 00:06:48 rgrimes Exp $
  */
 
 #ifndef lint

bin/ed/test/Makefile

@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.5 1994/09/24 02:55:35 davidg Exp $
+#	$Id: Makefile,v 1.6 1996/06/24 04:22:19 jkh Exp $
 
 SHELL=	/bin/sh
 ED=	${.OBJDIR}/ed

bin/ed/test/README

@@ -1,4 +1,4 @@
-#	$Id$
+#	$Id: README,v 1.4 1996/09/22 21:51:28 wosch Exp $
 
 The files in this directory with suffixes `.t', `.d', `.r' and `.err' are
 used for testing ed.  To run the tests, set the ED variable in the Makefile

bin/ed/test/ckscripts.sh

@@ -3,7 +3,7 @@
 # and compares their output against the .r files, which contain
 # the correct output
 #
-#	$Id$
+#	$Id: ckscripts.sh,v 1.3 1996/09/22 21:51:29 wosch Exp $
 
 PATH="/bin:/usr/bin:/usr/local/bin/:."
 ED=$1