This commit was manufactured by cvs2svn to create tag

'RELENG_2_1_5_RELEASE'.

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

CVS-INFO

@@ -1,44 +0,0 @@
-$FreeBSD$
-
-This file really doesn't belong here, but I wanted to elicit comment
-without starting a discussion as to where it really does belong.
-Anyway, here goes...
-
-When the new CVS tree was set up back in May, I wanted to ensure that
-everybody at least gave some thought to asking other people to look at
-code before it is committed.  Since we have had a number of rancorous
-discussions in the past about both committing code prematurely, and
-committing code that was written by someone else, I decided to use the
-`template' function of CVS to give people a chance to think about it.
-
-The template looks like this:
-
-Reviewed by:
-Submitted by:
-CVS: ----------------------------------------------------------------------
-CVS: Delete the ``Reviewed by'' line if this is somebody else's work
-CVS: (you are the reviewer).
-CVS: Delete the ``Submitted by'' line if this is NOT somebody else's
-CVS: work (you are the author).
-
-If you are making substantial or possibly controversial changes to the
-code, please talk to someone else who either has commit authority, or
-who is recognized as an expert in the BSD community.  This latter
-category includes the author of the program or subsystem you're
-modifying, like Rick Macklem for the NFS code, or Keith Bostic for
-`vi'.
-
-If the changes are insubstantial and noncontroversial (e.g., fixing
-spelling errors, or most Makefile changes) there is no need for
-review.  Please delete the ``Reviewed by:'' line, though, so that the
-logs look cleaner.
-
-If you are committing code or modifications which were originally done
-by some other person or group, them please please please make sure to
-credit them in the ``Submitted by'' line.  In this case, you are
-considered to be the reviewer.  If it is your own code, or that of
-another team member, then you should delete the ``Submitted by'' line,
-so that the logs look cleaner.
-
--GAWollman
-

HW.TROUBLE

@@ -1,49 +0,0 @@
-$Id$
-
-This file lists hardware, which doesn't do what it should do.
-
-Due to the nature of FreeBSD, we do not have the resources to test all
-possible kinds of hardware.  We do however every now and then find, buy
-or hear about hardware which doesn't work with FreeBSD or in general.
-
-This is that list.
-
-To be added to this list, a piece of hardware has to:
-	A: not do what it claims.
-or
-	B: not do what common sense would expect it to.
-
-Only if performance claims are wildly of the mark will it be listed here.
-
-All entries must have a date and a mail-address associated with them, to
-reflect when and by whom they were added.
-For multifunctional devices, please indicate if other parts of the device
-work OK, or are untested.
-For mutual incompabilities, list both devices.
-For SCSI and IDE-devices, list the string seen on boot of FreeBSD, if 
-possible, and trade name.
-Infer format from other entries, Keep sorted by first line.
-
-Thankyou.
-
----
-Controller, Data Technology DTC2280, "PC/AT Super I/O Card"
-IDE interface can be set to secondary address, but doesn't work there.  Suspect
-Interrupt isn't moved along.  Works fine on primary address.  Other parts of
-card not tested.
-19940828 [email protected]
----
-IDE-disk, <Maxtor 7345 AT>, "Maxtor 7345"
-Cannot coexist on the same IDE-controller with a <WDC AC2540H>, "Western 
-Digital Caviar 2540" disk.  Jumpers not exhaustively experimented with, as
-neither of the companies make sufficient information available.  Disk works
-fine when alone on IDE-controller.
-19940828 [email protected]
----
-IDE-disk, <WDC AC2540H>, "Western Digital Caviar 2540"
-Cannot coexist on the same IDE-controller with a <Maxtor 7345 AT>, "Maxtor
-7345" disk.  Jumpers not exhaustively experimented with, as neither of the 
-companies make sufficient information available.  Disk works fine when alone
-on IDE-controller.
-19940828 [email protected]
----

Makefile

@@ -1,5 +1,4 @@
-#
-#	$Id: Makefile,v 1.56 1995/05/13 03:34:23 rgrimes Exp $
+#	$Id: Makefile,v 1.57.4.17 1996/06/26 22:48:47 nate Exp $
 #
 # Make command line options:
 #	-DCLOBBER will remove /usr/include and MOST of /usr/lib
@@ -8,6 +7,7 @@
 #	-DMAKE_EBONES to build eBones (KerberosIV)
 #
 #	-DNOCLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
+#	-DNOCLEAN to not clean anything at all
 #	-DNOCRYPT will prevent building of crypt versions
 #	-DNOLKM do not build loadable kernel modules
 #	-DNOOBJDIR do not run ``${MAKE} obj''
@@ -86,19 +86,27 @@ OBJDIR=
 .else
 OBJDIR=		obj
 .endif
+
+.if defined(NOCLEAN)
+CLEANDIR=
+WORLD_CLEANDIST=obj
+.else
+WORLD_CLEANDIST=cleandist
 .if defined(NOCLEANDIR)
 CLEANDIR=	clean
 .else
 CLEANDIR=	cleandir
 .endif
+.endif
 
-world:	hierarchy mk cleandist includes lib-tools libraries tools
+world:	hierarchy mk $(WORLD_CLEANDIST) include-tools includes lib-tools libraries build-tools
 	@echo "--------------------------------------------------------------"
 	@echo " Rebuilding ${DESTDIR} The whole thing"
 	@echo "--------------------------------------------------------------"
 	@echo
 	${MAKE} depend all install
 	cd ${.CURDIR}/share/man &&		${MAKE} makedb
+	@echo "make world completed on `date`"
 
 hierarchy:
 	@echo "--------------------------------------------------------------"
@@ -112,6 +120,12 @@ update:
 	@echo "Running sup"
 	@echo "--------------------------------------------------------------"
 	@sup -v ${SUPFILE}
+.if defined(SUPFILE1)
+	@sup -v ${SUPFILE1}
+.endif
+.if defined(SUPFILE2)
+	@sup -v ${SUPFILE2}
+.endif
 .endif
 .if defined(CVS_UPDATE)
 	@echo "--------------------------------------------------------------"
@@ -208,10 +222,13 @@ includes:
 	cd ${.CURDIR}/gnu/lib/libdialog &&      ${MAKE} beforeinstall
 .if exists(eBones) && !defined(NOCRYPT) && defined(MAKE_EBONES)
 	cd ${.CURDIR}/eBones/include &&		${MAKE} beforeinstall
+	cd ${.CURDIR}/eBones/lib/libkrb &&	${MAKE} beforeinstall
+	cd ${.CURDIR}/eBones/lib/libkadm &&	${MAKE} beforeinstall
 .endif
 	cd ${.CURDIR}/lib/libc &&		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libcurses &&		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libedit &&		${MAKE} beforeinstall
+	cd ${.CURDIR}/lib/libftpio &&		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libmd &&		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libmytinfo &&		${MAKE}	beforeinstall
 	cd ${.CURDIR}/lib/libncurses &&		${MAKE}	beforeinstall
@@ -224,15 +241,16 @@ includes:
 	cd ${.CURDIR}/lib/libtermcap &&		${MAKE}	beforeinstall
 	cd ${.CURDIR}/lib/libcom_err &&		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libss &&		${MAKE} beforeinstall
-	cd ${.CURDIR}/lib/libforms &&		${MAKE}	beforeinstall
 	cd ${.CURDIR}/lib/libscsi &&		${MAKE}	beforeinstall
-	cd ${.CURDIR}/lib/libftp &&		${MAKE}	beforeinstall
+	cd ${.CURDIR}/lib/libutil &&		${MAKE}	beforeinstall
 
 lib-tools:
 	@echo "--------------------------------------------------------------"
 	@echo " Rebuilding tools needed to build the libraries"
 	@echo "--------------------------------------------------------------"
 	@echo
+	cd ${.CURDIR}/usr.bin/xinstall && \
+		${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
 	cd ${.CURDIR}/gnu/usr.bin/ld && \
 		${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
 	cd ${.CURDIR}/usr.bin/ar && \
@@ -289,13 +307,7 @@ libraries:
 	cd ${.CURDIR}/usr.bin/lex/lib && \
 		${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
 .if exists(eBones) && !defined(NOCRYPT) && defined(MAKE_EBONES)
-	cd ${.CURDIR}/eBones/des && \
-		${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
-	cd ${.CURDIR}/eBones/acl && \
-		${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
-	cd ${.CURDIR}/eBones/kdb && \
-		${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
-	cd ${.CURDIR}/eBones/krb && \
+	cd ${.CURDIR}/eBones/lib && \
 		${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
 .endif
 .if exists(usr.sbin/pcvt/keycap)
@@ -303,14 +315,30 @@ libraries:
 		 ${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
 .endif
 
-tools:
+include-tools:
 	@echo "--------------------------------------------------------------"
-	@echo " Rebuilding ${DESTDIR} Compiler and Make"
+	@echo " Rebuilding tools needed to build the includes"
+	@echo "--------------------------------------------------------------"
+	@echo
+	cd ${.CURDIR}/usr.bin/xinstall && \
+		${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
+
+build-tools:
+	@echo "--------------------------------------------------------------"
+	@echo " Rebuilding ${DESTDIR} C compiler, make, sgmlfmt, and zic(8)"
 	@echo "--------------------------------------------------------------"
 	@echo
 	cd ${.CURDIR}/gnu/usr.bin/cc && \
 		${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
 	cd ${.CURDIR}/usr.bin/make && \
 		${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
+	cd ${.CURDIR}/usr.bin/sgmlfmt && \
+		${MAKE} depend all install ${CLEANDIR} ${OBJDIR} 
+	cd ${.CURDIR}/share/sgml && \
+		${MAKE} depend all install ${CLEANDIR} ${OBJDIR} 
+	cd ${.CURDIR}/gnu/usr.bin/groff && \
+		${MAKE} depend all install ${CLEANDIR} ${OBJDIR} 
+	cd ${.CURDIR}/usr.sbin/zic && \
+		${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
 
 .include <bsd.subdir.mk>

README

@@ -1,69 +0,0 @@
-   -----------------------------------------
-       FreeBSD 2.0  ---  ALPHA Release                 ,        ,
-   -----------------------------------------          /(        )`
-                                                      \ \___   / |
-Welcome to the ALPHA release of FreeBSD 2.0 - the     /- _  `-/  '
-first public snapshot of our new 4.4BSD Lite based   (/\/ \ \   /\
-operating system environment.  This install proce-   / /   | `    \
-dure is also at the ALPHA stage, and contains only   O O   ) /    |
-the minimum functionality required by an             `-^--'`<     '
-*EXPERIENCED* person to install the system.         (_.)  _  )   /
-It is our hope, of course, that the feedback         `.___/`    /
-provided from this snapshot will                       `-----' /
-greatly assist us in making the release   <----.     __ / __   \
-of 2.0 much more user friendly.  Your     <----|====O)))==) \) /====
-comments and criticisms are very          <----'    `--' `.__,' \
-valuable to us, so please don't hesitate               |        |
-in contacting us!  Full details on where and            \       /	/\
-how to provide feedback are given below.           ______( (_  / \______/
-                                                 ,'  ,-----'   |
-This install procedure is ALPHA code, and        `--{__________)
-may very possibly *DESTROY* the contents of your
-ENTIRE DISK!  Please do not proceed with this installation
-unless you've adequately backed up your data first!
-
-If any errors occur during this installation, you can see them
-by toggling over to the alternate screen - type ALT-F2 to switch
-over, ALT-F1 to switch back to the install screen.  The debugging
-output on the second screen may be very valuable to us in understanding
-your bug report, so please be sure to take note of it when reporting
-any failures in the installation!  Thanks!
-
-Menus and scrolling output windows may be traversed with the arrow
-and Page Up/Page Down keys.  To suspend the installation at any point,
-hit ESC twice.  Hitting TAB will move the focus to different controls.
-If you've ever dealt with a DOS installation, you'll know how to deal
-with this.
-
-For a more complete description of what's new in this release, please
-see the release notes.
-
-For more documentation on this system, it is recommended that you purchase
-the 4.4BSD Document Set from O'Reilly Associates and the USENIX Association.
-ISBN 1-56592-082-1  We have no connection with O'Reilly, we're just
-satisfied customers!
-
-Have fun, and please let us know of any problems you encounter with
-this release!
-
-Comments should be sent to:
-
-	[email protected]
-
-Bug reports should be sent using the `send-pr' utility, if you
-were able to get the system installed, otherwise to:
-
-	[email protected]
-
-And general questions to:
-
-	[email protected]
-
-
-Please have patience if your questions are not answered right away -
-this is an especially busy time for us, and our volunteer resources
-are often strained to the limit (if not somewhat past!).
-
-Thanks!
-
-				The FreeBSD Project

TODO

@@ -1,166 +0,0 @@
-; $Id: TODO,v 1.11 1995/04/05 13:16:30 jkh Exp $
-
-** To skip this preamble, search forward for the pattern `**'.
-
-This file contains a list of ideas that people have come up for "good
-things to do" in FreeBSD.  These aren't necessarily things on the
-fast-track, and in fact consist mostly of things that the core team is
-never going to find the time to do so, if most things here are going
-to happen at all, they'll happen when someone reading this list steps
-forward and volunteers!
-
-That said, a lot of these ideas would be very nice to have and would
-add substantially to the perceived value of FreeBSD.  Some items on
-this list would add a LOT of value, for that matter, and are by no
-means trivial.  Take and fix an item with a (*) next to it and WC will
-even send you a free CD for your troubles!  It's the least they
-can do for all notable contributors.
-
-This is a also good place to look if you're keen for a little
-assignment, whole project or just something random to do.  Many folks
-often feel intimidated by the sheer size of FreeBSD and think "I'd
-like to pitch in somehow, but god, what can _I_ do?  I can't possibly
-do any of the things the core team are doing - aiiggh!  They'll laugh
-at my code, I know it!  I can't do it!"
-Trust us, don't worry!  Take a dedicated stab at something on this
-list and most of us will applaud - even if you don't finish, you may
-stir someone else into picking it up where you left off.  Above all,
-pick something you'll have fun doing!
-
-There are small things and large things in this list, and we may
-periodically reshuffle it to mark things done, outdated or more
-important.  Tasks are tagged with a unique ID number (YYMMDDNNN) for
-later tracking and are also easily machine-parsable by those seeking
-to browse them with some home-rolled search program.  Some indication
-of relative difficulty level is also given for each task, though it
-should be kept in mind that one persons "easy" is anothers
-"impossible", so take the ratings with a grain of salt! :)
-
-If you start working on something from this list, we also suggest that
-you contact the email-address listed for more information and to
-provide some central coordination for your effort.  If the email
-address given is simply <foo> then the email address can be presumed
-to be <[email protected]>.  If no email address is listed, then
-simply send to <[email protected]>.
-
-Thanks!
-
-					The FreeBSD core team.
-
-** --- cut here ---
-
-TASKID:	940820002
-TASK:	Add Linux/Crynwr compatible plip mode to lpt.c
-DETAIL: { Look at the crynwr packet-driver plip.asm (ftp::ftp.ftp.com)
-and the linux driver for reference. }
-EMAIL:	<phk>
-CATS:	kernel networking
-GRADE:	ADVANCED
-STATUS: OPEN (*)
-
-TASKID:	940820003
-TASK:	Add laptop-feature to wd.c
-DETAIL:	{ If disk just spun up, do sync when we have it running.  Need
-to detect that disk was turned off, e.g. had a long delay in becomming
-ready again. }
-EMAIL:	<phk>
-CATS:	kernel laptop
-GRADE:	INTERMEDIATE
-STATUS:	OPEN
-
-TASKID:	940820004
-TASK:	Add hot-swap PCMICIA bus and driver support.
-DETAIL:	{ Several teams in Linux and one in NetBSD are working on providing
-hot insertion/removal and autoconfiguration of PCMCIA cards.  This task
-also requires some modification of existing drivers to support being used
-by PCMCIA cards.  This task is both really hard and comparatively easy;
-hard because it's a big job, easy because others have already gone much of
-the way and you have their work for reference. }
-EMAIL:	<phk>
-CATS:	kernel laptop
-GRADE:	ADVANCED
-STATUS:	IN PROGRESS
-
-TASKID:	940820006
-TASK:	Add bootp/DHCP to the generic ethernet code.
-DETAIL:	{ Implement an ioctl(), which will send a bootp on a particular
-interface and return the data in a usable format. OR make a program which uses
-existing ioctls to do it.  See RFC153[34] for information on DHCP. }
-EMAIL:	<phk>
-CATS:	kernel networking
-GRADE:	ADVANCED
-STATUS:	OPEN (*)
-
-TASKID:	940820007
-TASK:	Add bootp/DHCP capability to slip driver.
-DETAIL: { Cisco's products implement this.  Both master and slave side would be
-desirable. }
-EMAIL:	<phk>
-CATS:	kernel networking
-GRADE:	ADVANCED
-STATUS:	OPEN (*)
-
-TASKID:	940820010
-TASK:	Make iostat find the disks
-DETAIL:	{ This is actually mostly a change to the device-drivers to collect 
-the information in the first place. }
-EMAIL:	<phk>
-CATS:	kernel
-GRADE:	INTERMEDIATE
-STATUS:	OPEN
-
-TASKID:	940820011
-TASK:	Silence "cc -Wall"
-DETAIL:	{ Lots of warnings if you try this.  You will find this a challenge
-actually, and it is good training in the C language.}
-EMAIL:	<phk>
-CATS:	kernel user
-GRADE:	INTERMEDIATE
-STATUS:	OPEN (*)
-
-TASKID: 940821001
-TASK:	Add XPG-style message catalogs.
-DETAIL:	{ NetBSD has apparently already done the necessary work, so this
-pretty much comes down to either evaluating their stuff and making any changes
-necessary, or simply starting from scratch.  Not having seen the code in
-question, I leave it up to the best judgement of the implementor as to how to
-best accomplish the task. }
-EMAIL:	<jkh>
-CATS:	user
-GRADE:	INTERMEDIATE
-STATUS:	CLOSED - PENDING DOC
-
-TASKID: 940911001
-TASK:	Make PAS16 a controller.
-DETAIL:	{ Make the ProAudioSpectrum a controller like wdc1 and attach 
-sound and cdrom drivers to it. }
-EMAIL:	<phk>
-CATS:	kernel
-GRADE:	INTERMEDIATE
-STATUS:	OPEN
-
-TASKID:	950222001
-TASK:	Make find smarter about -fstype local
-DETAIL:	{ Currently when doing a find blah -fstype local the find traverses
-through all nfs mounted file systems looking for locally mounted filesystems,
-this could be short circuited by using getmntinfo/statfs.  Note that you
-can not do this when following symlinks. }
-EMAIL:	<rgrimes, phk>
-CATS:	user
-GRADE:	INTERMEDIATE
-STATUS:	OPEN
-
-TASKID: 95031701
-TASK:	Implement a file system debugger (fsdb)
-DETAIL:	{ Traditionally, there has been a fsdb(8) program in Unix.
-This program is not part of 4.4BSD, but the current system lacks
-some utility to low-level step through the file system and repair
-(or damage:) something in case fsck tells about problems, but the
-administrator is unlucky with the suggested actions of fsck.
-The original fsdb had a terrible syntax, something more rationale
-should be built instead. }
-EMAIL:	<joerg>
-CATS:	user
-GRADE:	ADVANCED
-STATUS:	OPEN
-

bin/Makefile

@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+#	$Id: Makefile,v 1.2.6.2 1996/06/05 02:35:06 jkh Exp $
 
 SUBDIR=	cat 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 \

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

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)cat.1	8.1 (Berkeley) 6/29/93
-.\"	$Id$
+.\"	$Id: cat.1,v 1.2 1994/09/24 02:53:25 davidg Exp $
 .\"
 .Dd June 29, 1993
 .Dt CAT 1

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$
+ *	$Id: cat.c,v 1.2.6.1 1995/10/05 07:20:59 davidg Exp $
  */
 
 #ifndef lint
@@ -128,6 +128,7 @@ cook_args(argv)
 				fp = stdin;
 			else if ((fp = fopen(*argv, "r")) == NULL) {
 				warn("%s", *argv);
+				rval = 1;
 				++argv;
 				continue;
 			}
@@ -196,6 +197,7 @@ cook_buf(fp)
 	}
 	if (ferror(fp)) {
 		warn("%s", filename);
+		rval = 1;
 		clearerr(fp);
 	}
 	if (ferror(stdout))
@@ -216,6 +218,7 @@ raw_args(argv)
 				fd = fileno(stdin);
 			else if ((fd = open(*argv, O_RDONLY, 0)) < 0) {
 				warn("%s", *argv);
+				rval = 1;
 				++argv;
 				continue;
 			}
@@ -248,6 +251,8 @@ raw_cat(rfd)
 		for (off = 0; nr; nr -= nw, off += nw)
 			if ((nw = write(wfd, buf + off, nr)) < 0)
 				err(1, "stdout");
-	if (nr < 0)
+	if (nr < 0) {
 		warn("%s", filename);
+		rval = 1;
+	}
 }

bin/chflags/Makefile

@@ -1,7 +0,0 @@
-#	@(#)Makefile	8.1 (Berkeley) 6/6/93
-
-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/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$
+.\"	$Id: chmod.1,v 1.2.6.1 1996/05/29 22:18:03 jkh Exp $
 .\"
 .Dd March 31, 1994
 .Dt CHMOD 1
@@ -274,6 +274,7 @@ There's no
 .Ar perm
 option for the naughty bits.
 .Sh SEE ALSO
+.Xr chflags 1 ,
 .Xr install 1 ,
 .Xr chmod 2 ,
 .Xr stat 2 ,

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.3 1995/02/03 22:21:09 bde Exp $
+ *	$Id: chmod.c,v 1.4 1995/03/19 13:27:43 joerg 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$
+.\"	$Id: cp.1,v 1.2.6.2 1996/06/05 02:35:09 jkh Exp $
 .\"
 .Dd April 18, 1994
 .Dt CP 1

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.5 1995/04/02 00:49:16 bde Exp $
+ *	$Id: cp.c,v 1.6.4.2 1996/06/05 02:35:10 jkh Exp $
  */
 
 #ifndef lint

bin/cp/extern.h

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.2 (Berkeley) 4/1/94
- *	$Id$
+ *	$Id: extern.h,v 1.2.6.2 1996/06/05 02:35:10 jkh 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.2 1994/09/24 02:53:42 davidg Exp $
+ *	$Id: utils.c,v 1.3.4.4 1996/06/05 02:35:11 jkh Exp $
  */
 
 #ifndef lint
@@ -143,13 +143,12 @@ copy_file(entp, dne)
 		}
 	}
 
-	/* If the copy went bad, lose the file. */
-	if (rval == 1) {
-		(void)unlink(to.p_path);
-		(void)close(from_fd);
-		(void)close(to_fd);
-		return (1);
-	}
+	/*
+	 * Don't remove the target even after an error.  The target might
+	 * not be a regular file, or its attributes might be important,
+	 * or its contents might be irreplacable.  It would only be safe
+	 * to remove it if we created it and its length is 0.
+	 */
 
 	if (pflag && setfile(fs, to_fd))
 		rval = 1;
@@ -242,7 +241,8 @@ setfile(fs, fd)
 	int rval;
 
 	rval = 0;
-	fs->st_mode &= S_ISUID | S_ISGID | S_IRWXU | S_IRWXG | S_IRWXO;
+	fs->st_mode &= S_ISUID | S_ISGID | S_ISVTX |
+		       S_IRWXU | S_IRWXG | S_IRWXO;
 
 	TIMESPEC_TO_TIMEVAL(&tv[0], &fs->st_atimespec);
 	TIMESPEC_TO_TIMEVAL(&tv[1], &fs->st_mtimespec);

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$
+.\"	$Id: csh.1,v 1.2 1994/09/24 02:54:23 davidg 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$
+.\"	$Id: csh.2,v 1.2 1994/09/24 02:54:24 davidg 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.2 1994/09/24 02:53:48 davidg Exp $
+ *	$Id: const.c,v 1.3.4.2 1996/06/05 02:35:13 jkh 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.2 1994/09/24 02:53:49 davidg Exp $
+.\"	$Id: csh.1,v 1.3.4.2 1996/06/05 02:35:14 jkh Exp $
 .\"
 .Dd January 21, 1994
 .Dt CSH 1

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.2 1994/09/24 02:53:51 davidg Exp $
+ *	$Id: csh.c,v 1.3.4.3 1996/06/05 02:35:15 jkh Exp $
  */
 
 #ifndef lint
@@ -248,14 +248,6 @@ main(argc, argv)
     if ((tcp = getenv("TERM")) != NULL)
 	set(STRterm, SAVE(tcp));
 
-    /*
-     * Re-initialize path if set in environment
-     */
-    if ((tcp = getenv("PATH")) == NULL)
-	set1(STRpath, defaultpath(), &shvhed);
-    else
-	importpath(SAVE(tcp));
-
     set(STRshell, Strsave(STR_SHELLPATH));
 
     doldol = putn((int) getpid());	/* For $$ */
@@ -417,6 +409,16 @@ main(argc, argv)
 	    stderror(ERR_SYSTEM, "csh", strerror(errno));
 	}
     }
+
+    /*
+     * Re-initialize path if set in environment
+     * importpath uses intty and intact
+     */
+    if ((tcp = getenv("PATH")) == NULL)
+	set1(STRpath, defaultpath(), &shvhed);
+    else
+	importpath(SAVE(tcp));
+
     /*
      * Decide whether we should play with signals or not. If we are explicitly
      * told (via -i, or -) or we are a login shell (arg0 starts with -) or the
@@ -618,7 +620,8 @@ importpath(cp)
 	for (;;) {
 	    if ((c = *dp) == ':' || c == 0) {
 		*dp = 0;
-		if ((*cp != '/' || *cp == '\0') && (euid == 0 || uid == 0))
+		if (*cp != '/' && (euid == 0 || uid == 0) &&
+		    (intact || intty && isatty(SHOUT)))
 		    (void) fprintf(csherr,
 	    "Warning: imported path contains relative components\n");
 		pv[i++] = Strsave(*cp ? cp : STRdot);

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.2 1994/09/24 02:53:54 davidg Exp $
+ *	$Id: dir.c,v 1.3.4.1 1995/08/25 02:57:08 davidg Exp $
  */
 
 #ifndef lint
@@ -84,7 +84,7 @@ dinit(hp)
     /* Don't believe the login shell home, because it may be a symlink */
     tcp = getwd(path);		/* see ngetwd.c for System V version */
     if (tcp == NULL || *tcp == '\0') {
-	(void) fprintf(csherr, "csh: %s\n", path);
+	(void) fprintf(csherr, "csh: %s: %s\n", path, strerror(errno));
 	if (hp && *hp) {
 	    tcp = short2str(hp);
 	    if (chdir(tcp) == -1)

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.2 1994/09/24 02:53:59 davidg Exp $
+ *	$Id: exec.c,v 1.3.4.1 1995/08/25 02:58:40 davidg Exp $
  */
 
 #ifndef lint
@@ -656,7 +656,7 @@ tellmewhat(lex)
     register struct biltins *bptr;
     register struct wordent *sp = lex->next;
     bool    aliased = 0;
-    Char   *s0, *s1, *s2;
+    Char   *s0, *s1, *s2, *cmd;
     Char    qc;
 
     if (adrof1(sp->word, &aliases)) {
@@ -703,6 +703,8 @@ tellmewhat(lex)
 	}
     }
 
+    sp->word = cmd = globone(sp->word, G_IGNORE);
+
     if ((i = iscommand(strip(sp->word))) != 0) {
 	register Char **pv;
 	register struct varent *v;
@@ -717,10 +719,14 @@ tellmewhat(lex)
 	while (--i)
 	    pv++;
 	if (pv[0][0] == 0 || eq(pv[0], STRdot)) {
-	    sp->word = Strspl(STRdotsl, sp->word);
-	    prlex(cshout, lex);
-	    xfree((ptr_t) sp->word);
+	    if (!slash) {
+		sp->word = Strspl(STRdotsl, sp->word);
+		prlex(cshout, lex);
+		xfree((ptr_t) sp->word);
+	    } else
+		prlex(cshout, lex);
 	    sp->word = s0;	/* we save and then restore this */
+	    xfree((ptr_t) cmd);
 	    return;
 	}
 	s1 = Strspl(*pv, STRslash);
@@ -734,5 +740,6 @@ tellmewhat(lex)
 	    prlex(cshout, lex);
 	(void) fprintf(csherr, "%s: Command not found.\n", vis_str(sp->word));
     }
+    xfree((ptr_t) cmd);
     sp->word = s0;		/* we save and then restore this */
 }

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.2 1994/09/24 02:54:03 davidg Exp $
+ *	$Id: file.c,v 1.3.4.1 1995/08/25 03:01:01 davidg Exp $
  */
 
 #ifndef lint
@@ -112,14 +112,14 @@ static void
 setup_tty(on)
     int     on;
 {
-    static struct termios tchars;
+    struct termios tchars;
 
     (void) tcgetattr(SHIN, &tchars);
 
     if (on) {
 	tchars.c_cc[VEOL] = ESC;
 	if (tchars.c_lflag & ICANON)
-	    on = TCSANOW;
+	    on = TCSADRAIN;
 	else {
 	    on = TCSAFLUSH;
 	    tchars.c_lflag |= ICANON;
@@ -127,10 +127,10 @@ setup_tty(on)
     }
     else {
 	tchars.c_cc[VEOL] = _POSIX_VDISABLE;
-	on = TCSANOW;
+	on = TCSADRAIN;
     }
 
-    (void) tcsetattr(SHIN, TCSANOW, &tchars);
+    (void) tcsetattr(SHIN, on, &tchars);
 }
 
 /*

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.2 1994/09/24 02:54:04 davidg Exp $
+ *	$Id: func.c,v 1.3.4.2 1996/06/05 02:35:16 jkh 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.2 1994/09/24 02:54:05 davidg Exp $
+ *	$Id: glob.c,v 1.3 1995/05/30 00:06:35 rgrimes 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.2 1994/09/24 02:54:09 davidg Exp $
+ *	$Id: lex.c,v 1.3.4.1 1995/08/25 03:02:28 davidg Exp $
  */
 
 #ifndef lint
@@ -1187,7 +1187,7 @@ gethent(sc)
 	    }
 	    np = lhsb;
 	    event = 0;
-	    while (!cmap(c, _ESC | _META | _QF | _QB) && !any("${}:", c)) {
+	    while (!cmap(c, _ESC | _META | _QF | _QB) && !any("^$*-%{}:", c)) {
 		if (event != -1 && Isdigit(c))
 		    event = event * 10 + c - '0';
 		else

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$
+ *	$Id: misc.c,v 1.2 1994/09/24 02:54:10 davidg 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.2 1994/09/24 02:54:16 davidg Exp $
+ *	$Id: set.c,v 1.3.4.1 1995/08/25 02:55:49 davidg Exp $
  */
 
 #ifndef lint
@@ -664,7 +664,8 @@ exportpath(val)
 			       "Warning: ridiculously long PATH truncated\n");
 		break;
 	    }
-	    if ((**val != '/' || **val == '\0') && (euid == 0 || uid == 0))
+	    if (**val != '/' && (euid == 0 || uid == 0) &&
+		    (intact || intty && isatty(SHOUT)))
 		    (void) fprintf(csherr,
 		    "Warning: exported path contains relative components.\n");
 	    (void) Strcat(exppath, *val++);

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

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)date.1	8.2 (Berkeley) 11/17/93
-.\"	$Id: date.1,v 1.4 1994/09/24 02:54:34 davidg Exp $
+.\"	$Id: date.1,v 1.5.4.2 1996/03/12 05:32:12 nate Exp $
 .\"
 .Dd November 17, 1993
 .Dt DATE 1
@@ -107,7 +107,7 @@ in the
 manual page, as well as any arbitrary text.
 The format string for the default display is:
 .Bd -literal -offset indent
-``%a %b %e %H:%M:%S %Z %Y''.
+``%+''.
 .Ed
 .Pp
 If an operand does not have a leading plus sign, it is interpreted as
@@ -127,7 +127,7 @@ Hour, a number from 0 to 23.
 .It Ar mm
 Minutes, a number from 0 to 59.
 .It Ar .ss
-Seconds, a number from 0 to 61 (59 plus a a maximum of two leap seconds).
+Seconds, a number from 0 to 61 (59 plus a maximum of two leap seconds).
 .El
 .Pp
 Everything but the minutes is optional.

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.3 1994/12/26 12:59:28 bde Exp $
+ *	$Id: date.c,v 1.4.4.3 1996/06/05 02:35:18 jkh Exp $
  */
 
 #ifndef lint
@@ -123,7 +123,7 @@ main(argc, argv)
 	if (!rflag && time(&tval) == -1)
 		err(1, "time");
 
-	format = "%a %b %e %H:%M:%S %Z %Y";
+	format = "%+";
 
 	/* allow the operands in any order */
 	if (*argv && **argv == '+') {

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 1995/05/30 00:06:41 rgrimes Exp $
  */
 
 #ifndef lint

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 1994/09/24 02:54:42 davidg Exp $
  */
 
 #ifndef lint

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 1994/09/24 02:54:44 davidg Exp $
  */
 
 #ifndef lint

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 1994/09/24 02:54:49 davidg 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.3 1995/01/17 22:55:59 ache Exp $
+ *	$Id: dd.c,v 1.4.4.2 1996/06/05 02:35:21 jkh Exp $
  */
 
 #ifndef lint

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 1994/09/24 02:54:54 davidg Exp $
  */
 
 /* Input/output stream state. */

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 1994/09/24 02:55:01 davidg Exp $
  */
 
 #ifndef lint

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$
+.\"	$Id: df.1,v 1.3 1994/09/24 02:55:08 davidg Exp $
 .\"
 .Dd January 13, 1994
 .Dt DF 1

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.6 1995/03/19 13:28:15 joerg Exp $
+ *	$Id: df.c,v 1.7.4.3 1996/06/11 04:38:08 bde Exp $
  */
 
 #ifndef lint
@@ -386,10 +386,7 @@ ufs_df(file, maxwidth)
 	sfsp->f_blocks = sblock.fs_dsize;
 	sfsp->f_bfree = sblock.fs_cstotal.cs_nbfree * sblock.fs_frag +
 		sblock.fs_cstotal.cs_nffree;
-	sfsp->f_bavail = (sblock.fs_dsize * (100 - sblock.fs_minfree) / 100) -
-		(sblock.fs_dsize - sfsp->f_bfree);
-	if (sfsp->f_bavail < 0)
-		sfsp->f_bavail = 0;
+	sfsp->f_bavail = freespace(&sblock, sblock.fs_minfree);
 	sfsp->f_files =  sblock.fs_ncg * sblock.fs_ipg;
 	sfsp->f_ffree = sblock.fs_cstotal.cs_nifree;
 	sfsp->f_fsid.val[0] = 0;

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$
+.\"	$Id: echo.1,v 1.2.6.2 1996/06/05 02:35:27 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$
+ *	$Id: echo.c,v 1.2.6.2 1996/06/05 02:35:30 jkh Exp $
  */
 
 #ifndef lint

bin/ed/Makefile

@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.9 1994/10/29 10:13:34 phk Exp $
+#	$Id: Makefile,v 1.10.4.2 1996/06/05 02:35:34 jkh 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.4 1994/09/24 02:55:24 davidg Exp $
+ *	$Id: cbc.c,v 1.5 1995/03/19 13:28:24 joerg Exp $
  */
 
 #ifndef lint

bin/ed/ed.1

@@ -1,4 +1,4 @@
-.\"	$Id$
+.\"	$Id: ed.1,v 1.6 1994/09/24 02:55:24 davidg 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.3 1994/09/24 02:55:27 davidg Exp $
+ *	$Id: io.c,v 1.4.4.2 1996/06/05 02:35:35 jkh 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.4 1995/03/19 13:28:34 joerg Exp $
+ *	$Id: main.c,v 1.5 1995/05/30 00:06:47 rgrimes 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$
+#	$Id: Makefile,v 1.5 1994/09/24 02:55:35 davidg Exp $
 
 SHELL=	/bin/sh
 ED=	../obj/ed

bin/ed/undo.c

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

bin/expr/Makefile

@@ -1,5 +1,5 @@
 #	/b/source/CVS/src/bin/expr/Makefile,v 1.5 1993/06/14 19:56:06 jtc Exp
-#	$Id: Makefile,v 1.6 1994/09/24 02:55:36 davidg Exp $
+#	$Id: Makefile,v 1.7.4.2 1996/06/05 02:35:37 jkh Exp $
 
 PROG=		expr
 SRCS=		expr.c

bin/expr/expr.1

@@ -15,7 +15,7 @@
 .\"    must display the following acknowledgement:
 .\"      This product includes software developed by Winning Strategies, Inc.
 .\" 4. The name of the author may not be used to endorse or promote products
-.\"    derived from this software withough specific prior written permission
+.\"    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
@@ -28,7 +28,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: expr.1,v 1.2 1993/10/04 22:07:27 jtc Exp $
+.\"	$Id: expr.1,v 1.3.6.1 1996/01/30 13:59:02 mpp Exp $
 .\"
 .Dd July 3, 1993
 .Dt EXPR 1
@@ -51,8 +51,8 @@ All operators are separate arguments to the
 utility.
 Characters special to the command interpreter must be escaped.
 .Pp
-Operators are listed below in order of increasing precidence.
-Operators with equal precidence are grouped within { } symbols.
+Operators are listed below in order of increasing precedence.
+Operators with equal precedence are grouped within { } symbols.
 .Bl -tag -width indent
 .It Ar expr1 Li | Ar expr2
 Returns the evaluation of 
@@ -66,7 +66,7 @@ Returns the evaluation of
 if neither expression evaluates to an empty string or zero;
 otherwise, returns zero.
 .It Ar expr1 Li "{=, >, >=, <, <=, !=}" Ar expr2
-Returns the results of integer comparision if both arguments are integers; 
+Returns the results of integer comparison if both arguments are integers; 
 otherwise, returns the results of string comparison using the locale-specific
 collation sequence.
 The result of each comparison is 1 if the specified relation is true,