This commit was manufactured by cvs2svn to create tag

'RELENG_2_1_5_RELEASE'.

CVS-INFO

@@ -13,13 +13,24 @@ committing code that was written by someone else, I decided to use the
 
 The template looks like this:
 
-Reviewed by:
-Submitted by:
+Reviewed by:    
+Submitted by:   
+Obtained from:
 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).
+CVS: Obtained from:
+CVS:   If this change has been taken from another system, such as NetBSD,
+CVS:   then name the system in this line, otherwise delete it.
+CVS: Reviewed by:
+CVS:   Before committing changes please have someone check your work and
+CVS:   include their name here. If the change is trivial and you have not
+CVS:   had it reviewed then delete this line.
+CVS: Submitted by:
+CVS:   If this code has been contributed to FreeBSD by someone else; i.e.,
+CVS:   they sent us a patch or a new module, then include their name/email
+CVS:   address here. If this is your work then delete this line.
+
+(Note that these lines will also automatically removed now if the tags
+are empty.)
 
 If you are making substantial or possibly controversial changes to the
 code, please talk to someone else who either has commit authority, or
@@ -42,3 +53,13 @@ so that the logs look cleaner.
 
 -GAWollman
 
+
+Importing new stuff is somewhat error-prone since it's easy to create
+unwanted directories or even whole subtrees without noticing it.  The
+script ``easy-import'' has been created to make first-time imports
+easier to handle (vendor-branch imports are not yet supported), and to
+help people avoiding the most common errors.  It is available as
+/usr/local/bin/easy-import on freefall, or in the source tree as
+src/gnu/usr.bin/cvs/contrib/easy-import.pl.
+
+Jörg Wunsch

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.16 1996/06/21 19:41:35 markm 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,4 +1,4 @@
-; $Id: TODO,v 1.11 1995/04/05 13:16:30 jkh Exp $
+; $Id: TODO,v 1.12 1995/04/23 21:34:23 paul Exp $
 
 ** To skip this preamble, search forward for the pattern `**'.
 
@@ -49,21 +49,12 @@ Thanks!
 
 ** --- 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>
+EMAIL:	<phk, nate>
 CATS:	kernel laptop
 GRADE:	INTERMEDIATE
 STATUS:	OPEN
@@ -76,21 +67,11 @@ 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>
+EMAIL:	<phk, nate>
 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
@@ -149,18 +130,3 @@ 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 1994/09/18 21:25:26 wollman 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/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.3 1995/10/03 12:46:37 bde 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/chmod.1

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)chmod.1	8.4 (Berkeley) 3/31/94
-.\"	$Id$
+.\"	$Id: chmod.1,v 1.2 1994/09/24 02:53:37 davidg 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/cp/cp.1

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)cp.1	8.3 (Berkeley) 4/18/94
-.\"	$Id$
+.\"	$Id: cp.1,v 1.2 1994/09/24 02:53:40 davidg 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 1995/05/30 00:06:21 rgrimes 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 1994/09/24 02:53:41 davidg 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.2 1995/10/05 07:24:24 davidg 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/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 1995/05/30 00:06:29 rgrimes 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 1995/05/06 13:52:29 ache 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.1 1995/08/25 02:55:47 davidg 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/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 1995/05/30 00:06:30 rgrimes 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/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 1995/05/30 00:06:32 rgrimes 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/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 1995/05/30 00:06:33 rgrimes 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 1995/05/30 00:06:34 rgrimes 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 1995/05/30 00:06:35 rgrimes 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/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 1995/05/30 00:06:38 rgrimes 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/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.1 1995/08/28 10:33:04 davidg 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.1 1995/08/28 10:31:25 davidg 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/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 1995/01/17 23:04:29 ache Exp $
  */
 
 #ifndef lint

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.2 1996/06/05 02:35:24 jkh 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/echo/echo.1

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)echo.1	8.1 (Berkeley) 7/22/93
-.\"	$Id$
+.\"	$Id: echo.1,v 1.2 1994/09/24 02:55:17 davidg 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 1994/09/24 02:55:18 davidg 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 1994/12/18 15:15:10 jkh Exp $
 
 PROG=	ed
 SRCS=	 buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c

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 1995/03/19 13:28:32 joerg 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 1995/05/30 00:06:49 rgrimes 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 1994/04/24 01:18:46 jkh 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,

bin/expr/expr.y

@@ -4,7 +4,7 @@
  *
  * Largely rewritten by J.T. Conklin ([email protected])
  *
- * $Id: expr.y,v 1.8 1994/09/24 02:55:37 davidg Exp $
+ * $Id: expr.y,v 1.11 1995/11/18 18:05:03 joerg Exp $
  */
 
 #include <stdio.h>
@@ -15,7 +15,7 @@
 #include <err.h>
   
 enum valtype {
-	integer, string
+	integer, numeric_string, string
 } ;
 
 struct val {
@@ -56,7 +56,6 @@ char **av;
 %left <val> '+' '-'
 %left <val> '*' '/' '%'
 %left <val> ':'
-%left UNARY
 
 %token <val> TOKEN
 %type <val> start expr
@@ -94,7 +93,7 @@ int i;
 
 	vp = (struct val *) malloc (sizeof (*vp));
 	if (vp == NULL) {
-		err (2, NULL);
+		errx (2, "malloc() failed");
 	}
 
 	vp->type = integer;
@@ -107,13 +106,26 @@ make_str (s)
 char *s;
 {
 	struct val *vp;
+	int i, isint;
 
 	vp = (struct val *) malloc (sizeof (*vp));
 	if (vp == NULL || ((vp->u.s = strdup (s)) == NULL)) {
-		err (2, NULL);
+		errx (2, "malloc() failed");
 	}
 
-	vp->type = string;
+	for(i = 1, isint = isdigit(s[0]) || s[0] == '-';
+	    isint && i < strlen(s);
+	    i++)
+	{
+		if(!isdigit(s[i]))
+			 isint = 0;
+	}
+
+	if (isint)
+		vp->type = numeric_string;
+	else	
+		vp->type = string;
+
 	return vp;
 }
 
@@ -122,7 +134,7 @@ void
 free_value (vp)
 struct val *vp;
 {
-	if (vp->type == string)
+	if (vp->type == string || vp->type == numeric_string)
 		free (vp->u.s);	
 }
 
@@ -131,34 +143,19 @@ int
 to_integer (vp)
 struct val *vp;
 {
-	char *s;
-	int neg;
 	int i;
 
 	if (vp->type == integer)
 		return 1;
 
-	s = vp->u.s;
-	i = 0;
-      
-	neg = (*s == '-');
-	if (neg)
-		s++;
-      
-	for (;*s; s++) {
-		if (!isdigit (*s)) 
-			return 0;
-      
-		i *= 10;
-		i += *s - '0';
-	}
+	if (vp->type == string)
+		return 0;
 
+	/* vp->type == numeric_string, make it numeric */
+	i  = atoi(vp->u.s);
 	free (vp->u.s);
-	if (neg) 
-		i *= -1;
-  
+	vp->u.i = i;
 	vp->type = integer;
-	vp->u.i  = i;
 	return 1;
 }
 
@@ -168,12 +165,12 @@ struct val *vp;
 {
 	char *tmp;
 
-	if (vp->type == string)
+	if (vp->type == string || vp->type == numeric_string)
 		return;
 
 	tmp = malloc (25);
 	if (tmp == NULL) {
-		err (2, NULL);
+		errx (2, "malloc() failed");
 	}
 
 	sprintf (tmp, "%d", vp->u.i);
@@ -186,6 +183,7 @@ int
 isstring (vp)
 struct val *vp;
 {
+	/* only TRUE if this string is not a valid integer */
 	return (vp->type == string);
 }
 
@@ -229,7 +227,7 @@ struct val *vp;
 
 int yyparse ();
 
-void
+int
 main (argc, argv)
 int argc;
 char **argv;
@@ -245,7 +243,7 @@ char **argv;
 	else
 		printf ("%s\n", result->u.s);
 
-	exit (is_zero_or_null (result));
+	return (is_zero_or_null (result));
 }
 
 int
@@ -294,6 +292,8 @@ struct val *a, *b;
 		to_string (b);	
 		r = make_integer (strcoll (a->u.s, b->u.s) == 0);
 	} else {
+		(void)to_integer(a);
+		(void)to_integer(b);
 		r = make_integer (a->u.i == b->u.i);
 	}
 
@@ -313,6 +313,8 @@ struct val *a, *b;
 		to_string (b);
 		r = make_integer (strcoll (a->u.s, b->u.s) > 0);
 	} else {
+		(void)to_integer(a);
+		(void)to_integer(b);
 		r= make_integer (a->u.i > b->u.i);
 	}
 
@@ -332,6 +334,8 @@ struct val *a, *b;
 		to_string (b);
 		r = make_integer (strcoll (a->u.s, b->u.s) < 0);
 	} else {
+		(void)to_integer(a);
+		(void)to_integer(b);
 		r = make_integer (a->u.i < b->u.i);
 	}
 
@@ -351,6 +355,8 @@ struct val *a, *b;
 		to_string (b);
 		r = make_integer (strcoll (a->u.s, b->u.s) >= 0);
 	} else {
+		(void)to_integer(a);
+		(void)to_integer(b);
 		r = make_integer (a->u.i >= b->u.i);
 	}
 
@@ -370,6 +376,8 @@ struct val *a, *b;
 		to_string (b);
 		r = make_integer (strcoll (a->u.s, b->u.s) <= 0);
 	} else {
+		(void)to_integer(a);
+		(void)to_integer(b);
 		r = make_integer (a->u.i <= b->u.i);
 	}
 
@@ -389,6 +397,8 @@ struct val *a, *b;
 		to_string (b);
 		r = make_integer (strcoll (a->u.s, b->u.s) != 0);
 	} else {
+		(void)to_integer(a);
+		(void)to_integer(b);
 		r = make_integer (a->u.i != b->u.i);
 	}
 

bin/hostname/hostname.1

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)hostname.1	8.1 (Berkeley) 5/31/93
-.\"	$Id$
+.\"	$Id: hostname.1,v 1.2.6.2 1996/06/05 02:35:38 jkh Exp $
 .\"
 .Dd May 31, 1993
 .Dt HOSTNAME 1
@@ -58,7 +58,7 @@ Trims off any domain information from the printed
 name.
 .El
 .Sh SEE ALSO
-.Xr gethostname 2
+.Xr gethostname 3
 .Sh HISTORY
 The
 .Nm hostname

bin/ln/ln.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ln.c,v 1.4 1994/09/24 02:55:48 davidg Exp $
+ *	$Id: ln.c,v 1.5 1994/12/06 18:50:44 bde Exp $
  */
 
 #ifndef lint

bin/ls/ls.1

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ls.1	8.6 (Berkeley) 4/18/94
-.\"	$Id$
+.\"	$Id: ls.1,v 1.4 1995/09/26 08:48:09 mpp Exp $
 .\"
 .Dd April 18, 1994
 .Dt LS 1
@@ -82,9 +82,10 @@ Force multi-column output; this is the default when output is to a terminal.
 Display a slash (/) immediately after each pathname
 that is a directory, an asterisk (*) after each that is
 executable,
-and an at sign (@) after each symbolic link.
-.\" and a vertical bar (|) after each that is a
-.\" .Tn FIFO . 
+an at sign (@) after each symbolic link,
+an equals sign (=) after each socket,
+and a vertical bar (|) after each that is a
+.Tn FIFO . 
 .It Fl L
 If argument is a symbolic link, list the file or directory the link references
 rather than the link itself.
@@ -215,8 +216,8 @@ Directory.
 Symbolic link.
 .It Sy s
 Socket link.
-.\" .It Sy p
-.\" .Tn FIFO .
+.It Sy p
+.Tn FIFO .
 .It Sy \-
 Regular file.
 .El

bin/ls/ls.c

@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ls.c,v 1.5 1995/03/19 13:28:44 joerg Exp $
+ *	$Id: ls.c,v 1.6 1995/03/23 19:05:00 phk Exp $
  */
 
 #ifndef lint

bin/ls/print.c

@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: print.c,v 1.3 1995/03/19 13:28:46 joerg Exp $
+ *	$Id: print.c,v 1.4.4.1 1995/08/28 10:30:27 davidg Exp $
  */
 
 #ifndef lint
@@ -52,7 +52,6 @@ static char sccsid[] = "@(#)print.c	8.4 (Berkeley) 4/17/94";
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include <tzfile.h>
 #include <unistd.h>
 #include <utmp.h>
 
@@ -228,13 +227,13 @@ printtime(ftime)
 	time_t ftime;
 {
 	int i;
-	char *longstring;
+	char longstring[80];
 
-	longstring = ctime(&ftime);
+	strftime(longstring, sizeof(longstring), "%c", localtime(&ftime));
 	for (i = 4; i < 11; ++i)
 		(void)putchar(longstring[i]);
 
-#define	SIXMONTHS	((DAYSPERNYEAR / 2) * SECSPERDAY)
+#define	SIXMONTHS	((365 / 2) * 86400)
 	if (f_sectime)
 		for (i = 11; i < 24; i++)
 			(void)putchar(longstring[i]);

bin/ls/util.c

@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: util.c,v 1.3 1994/09/24 02:55:58 davidg Exp $
+ *	$Id: util.c,v 1.4 1994/10/09 15:25:23 ache Exp $
  */
 
 #ifndef lint

bin/mv/mv.1

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mv.1	8.1 (Berkeley) 5/31/93
-.\"	$Id$
+.\"	$Id: mv.1,v 1.2.6.1 1995/08/29 11:14:21 davidg Exp $
 .\"
 .Dd May 31, 1993
 .Dt MV 1
@@ -112,7 +112,7 @@ to accomplish the move.
 The effect is equivalent to:
 .Bd -literal -offset indent
 rm -f destination_path && \e
-\tcp -pr source_file destination && \e
+\tcp -pRP source_file destination && \e
 \trm -rf source_file
 .Ed
 .Pp

bin/mv/mv.c

@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: mv.c,v 1.2.6.1 1995/10/09 05:12:21 davidg Exp $
  */
 
 #ifndef lint
@@ -116,10 +116,16 @@ endarg:	argc -= optind;
 	*endp++ = '/';
 	++baselen;
 	for (rval = 0; --argc; ++argv) {
-		if ((p = strrchr(*argv, '/')) == NULL)
-			p = *argv;
-		else
-			++p;
+		/*
+		 * Find the last component of the source pathname.  It
+		 * may have trailing slashes.
+		 */
+		p = *argv + strlen(*argv);
+		while (p != *argv && p[-1] == '/')
+			--p;
+		while (p != *argv && p[-1] != '/')
+			--p;
+
 		if ((baselen + (len = strlen(p))) >= MAXPATHLEN) {
 			warnx("%s: destination pathname too long", *argv);
 			rval = 1;

bin/pax/ar_io.c

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

bin/pax/ar_subs.c

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

bin/pax/buf_subs.c

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

bin/pax/cache.c

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

bin/pax/cpio.c

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

bin/pax/file_subs.c

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

bin/pax/ftree.c

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

bin/pax/gen_subs.c

@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: gen_subs.c,v 1.3 1995/03/19 13:28:49 joerg Exp $
+ *	$Id: gen_subs.c,v 1.4.4.1 1995/08/28 10:41:14 davidg Exp $
  */
 
 #ifndef lint
@@ -47,7 +47,6 @@ static char sccsid[] = "@(#)gen_subs.c	8.1 (Berkeley) 5/31/93";
 #include <sys/param.h>
 #include <stdio.h>
 #include <ctype.h>
-#include <tzfile.h>
 #include <utmp.h>
 #include <unistd.h>
 #include <stdlib.h>
@@ -64,7 +63,7 @@ static char sccsid[] = "@(#)gen_subs.c	8.1 (Berkeley) 5/31/93";
  */
 #define MODELEN 20
 #define DATELEN 64
-#define SIXMONTHS	 ((DAYSPERNYEAR / 2) * SECSPERDAY)
+#define SIXMONTHS	 ((365 / 2) * 86400)
 #define CURFRMT		"%b %e %H:%M"
 #define OLDFRMT		"%b %e  %Y"
 #ifndef UT_NAMESIZE

bin/pax/options.c

@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: options.c,v 1.2 1994/09/24 02:56:22 davidg Exp $
+ *	$Id: options.c,v 1.3 1995/03/19 13:28:53 joerg Exp $
  */
 
 #ifndef lint

bin/pax/pat_rep.c

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

bin/pax/pax.1

@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)pax.1	8.4 (Berkeley) 4/18/94
-.\"	$Id$
+.\"	$Id: pax.1,v 1.3 1995/08/16 23:12:25 nate Exp $
 .\"
 .Dd April 18, 1994
 .Dt PAX 1
@@ -1048,7 +1048,7 @@ copies the contents of the current directory to the device
 .Pa /dev/rst0 .
 .Pp
 The command:
-.Dl pax -r -v -f filename
+.Dl pax -v -f filename
 gives the verbose table of contents for an archive stored in
 .Pa filename .
 .Pp

bin/pax/pax.c

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

bin/pax/pax.h

@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pax.h	8.2 (Berkeley) 4/18/94
- *	$Id: pax.h,v 1.2 1994/09/24 02:56:28 davidg Exp $
+ *	$Id: pax.h,v 1.3 1995/05/30 00:07:01 rgrimes Exp $
  */
 
 /*
@@ -227,9 +227,9 @@ typedef struct oplist {
 #ifndef MIN
 #define        MIN(a,b) (((a)<(b))?(a):(b))
 #endif
-#define MAJOR(x)        (((unsigned)(x) >> 8) & 0xff)
-#define MINOR(x)        ((x) & 0xff)
-#define TODEV(x, y)	(((unsigned)(x) << 8) | ((unsigned)(y)))
+#define MAJOR(x)	major(x)
+#define MINOR(x)	minor(x)
+#define TODEV(x, y)	makedev((x), (y))
 
 /*
  * General Defines

bin/pax/sel_subs.c

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

bin/pax/tables.c

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

bin/pax/tar.c

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

bin/pax/tty_subs.c

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

bin/ps/Makefile

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/2/93
-#	$Id: Makefile,v 1.4 1995/04/15 03:23:36 davidg Exp $
+#	$Id: Makefile,v 1.5 1995/04/15 03:31:19 davidg Exp $
 
 PROG=	ps
 SRCS=	fmt.c keyword.c nlist.c print.c ps.c

bin/ps/fmt.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: fmt.c,v 1.4 1994/11/10 23:25:12 ats Exp $
+ *	$Id: fmt.c,v 1.5 1995/03/09 20:40:17 davidg Exp $
  */
 
 #ifndef lint

bin/ps/keyword.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: keyword.c,v 1.4 1994/10/02 08:19:10 davidg Exp $
+ *	$Id: keyword.c,v 1.5.6.1 1995/10/05 07:46:36 davidg Exp $
  */
 
 #ifndef lint
@@ -161,7 +161,7 @@ VAR var[] = {
 	{"tpgid", "TPGID", NULL, 0, evar, 4, EOFF(e_tpgid), ULONG, PIDFMT},
 	{"tsess", "TSESS", NULL, 0, evar, 6, EOFF(e_tsess), KPTR, "x"},
 	{"tsiz", "TSIZ", NULL, 0, tsize, 4},
-	{"tt", "TT", NULL, LJUST, tname, 3},
+	{"tt", "TT ", NULL, 0, tname, 4},
 	{"tty", "TTY", NULL, LJUST, longtname, 8},
 	{"ucomm", "UCOMM", NULL, LJUST, ucomm, MAXCOMLEN},
 	{"uid", "UID", NULL, 0, evar, UIDLEN, EOFF(e_ucred.cr_uid),
@@ -248,7 +248,7 @@ VAR var[] = {
 	{"trs", "TRS", NULL, 0, trss, 3},
 	{"tsess", "TSESS", NULL, 0, evar, 6, EOFF(e_tsess), KPTR, "x"},
 	{"tsiz", "TSIZ", NULL, 0, tsize, 4},
-	{"tt", "TT", NULL, LJUST, tname, 3},
+	{"tt", "TT", NULL, LJUST, tname, 4},
 	{"tty", "TTY", NULL, LJUST, longtname, 8},
 	{"ucomm", "UCOMM", NULL, LJUST, ucomm, MAXCOMLEN},
 	{"uid", "UID", NULL, 0, pvar, UIDLEN, POFF(p_uid),USHORT, UIDFMT},

bin/ps/print.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: print.c,v 1.6 1995/03/19 13:29:01 joerg Exp $
+ *	$Id: print.c,v 1.7.4.2 1995/10/05 07:46:37 davidg Exp $
  */
 
 #ifndef lint
@@ -65,7 +65,6 @@ static char sccsid[] = "@(#)print.c	8.6 (Berkeley) 4/16/94";
 #include <stdlib.h>
 #include <string.h>
 #include <vis.h>
-#include <tzfile.h>
 
 #include "ps.h"
 
@@ -323,7 +322,7 @@ tname(k, ve)
 	v = ve->var;
 	dev = KI_EPROC(k)->e_tdev;
 	if (dev == NODEV || (ttname = devname(dev, S_IFCHR)) == NULL)
-		(void)printf("%-*s", v->width, "??");
+		(void)printf("%*s ", v->width-1, "??");
 	else {
 		if (strncmp(ttname, "tty", 3) == 0 ||
 		    strncmp(ttname, "cua", 3) == 0)
@@ -369,11 +368,11 @@ started(k, ve)
 	tp = localtime(&k->ki_u.u_start.tv_sec);
 	if (!now)
 		(void)time(&now);
-	if (now - k->ki_u.u_start.tv_sec < 24 * SECSPERHOUR) {
+	if (now - k->ki_u.u_start.tv_sec < 24 * 3600) {
 		/* I *hate* SCCS... */
 		static char fmt[] = __CONCAT("%l:%", "M%p");
 		(void)strftime(buf, sizeof(buf) - 1, fmt, tp);
-	} else if (now - k->ki_u.u_start.tv_sec < 7 * SECSPERDAY) {
+	} else if (now - k->ki_u.u_start.tv_sec < 7 * 86400) {
 		/* I *hate* SCCS... */
 		static char fmt[] = __CONCAT("%a%", "I%p");
 		(void)strftime(buf, sizeof(buf) - 1, fmt, tp);

bin/ps/ps.1

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ps.1	8.3 (Berkeley) 4/18/94
-.\"	$Id$
+.\"	$Id: ps.1,v 1.4.6.2 1996/02/22 19:51:39 peter Exp $
 .\"
 .Dd April 18, 1994
 .Dt PS 1
@@ -47,6 +47,7 @@
 .Op Fl o Ar fmt
 .Op Fl p Ar pid
 .Op Fl t Ar tty
+.Op Fl U Ar username
 .Op Fl W Ar swap
 .Nm ps
 .Op Fl L
@@ -54,7 +55,7 @@
 .Nm \&Ps
 displays a header line followed by lines containing information about your
 processes that have controlling terminals.
-This information is sorted by process
+This information is sorted by controlling terminal, then by process
 .Tn ID .
 .Pp
 The information displayed is selected based on a set of keywords (see the
@@ -68,6 +69,12 @@ The default output format includes, for each process, the process'
 controlling terminal, cpu time (including both user and system time),
 state, and associated command.
 .Pp
+The process file system (see
+.Xr procfs 5
+\&) should be mounted when
+.Nm
+is executed, otherwise not all information will be available.
+.Pp
 The options are as follows:
 .Bl -tag -width indent
 .It Fl a
@@ -130,6 +137,9 @@ with the standard input.
 .It Fl t
 Display information about processes attached to the specified terminal
 device.
+.It Fl U
+Display the processes belonging to the specified
+.Tn username .
 .It Fl u
 Display information associated with the following keywords:
 user, pid, %cpu, %mem, vsz, rss, tt, state, start, time and command.
@@ -478,7 +488,7 @@ wait channel (as a symbolic name)
 exit or stop status (valid only for stopped or zombie process)
 .El
 .Sh FILES
-.Bl -tag -width /var/run/kvm_kernel.db -compact
+.Bl -tag -width /var/db/kvm_kernel.db -compact
 .It Pa /dev
 special files and device names
 .It Pa /dev/drum
@@ -487,16 +497,20 @@ default swap device
 default kernel memory
 .It Pa /var/run/dev.db
 /dev name database
-.It Pa /var/run/kvm_kernel.db
+.It Pa /var/db/kvm_kernel.db
 system namelist database
 .It Pa /kernel
 default system namelist
+.It Pa /proc
+the mount point of
+.Xr procfs 5
 .El
 .Sh SEE ALSO
 .Xr kill 1 ,
 .Xr w 1 ,
 .Xr kvm 3 ,
 .Xr strftime 3 ,
+.Xr procfs 5 ,
 .Xr pstat 8
 .Sh BUGS
 Since

bin/ps/ps.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ps.c,v 1.6 1995/03/19 13:29:06 joerg Exp $
+ *	$Id: ps.c,v 1.7.4.1 1996/02/22 19:51:40 peter Exp $
  */
 
 #ifndef lint
@@ -62,6 +62,7 @@ static char sccsid[] = "@(#)ps.c	8.4 (Berkeley) 4/2/94";
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <pwd.h>
 #include <unistd.h>
 
 #include "ps.h"
@@ -109,6 +110,7 @@ main(argc, argv)
 	struct kinfo_proc *kp;
 	struct varent *vent;
 	struct winsize ws;
+	struct passwd *pwd;
 	dev_t ttydev;
 	pid_t pid;
 	uid_t uid;
@@ -133,7 +135,7 @@ main(argc, argv)
 	ttydev = NODEV;
 	memf = nlistf = swapf = NULL;
 	while ((ch = getopt(argc, argv,
-	    "aCeghjLlM:mN:O:o:p:rSTt:uvW:wx")) != EOF)
+	    "aCeghjLlM:mN:O:o:p:rSTt:U:uvW:wx")) != EOF)
 		switch((char)ch) {
 		case 'a':
 			all = 1;
@@ -214,6 +216,14 @@ main(argc, argv)
 			ttydev = sb.st_rdev;
 			break;
 		}
+		case 'U':
+			pwd = getpwnam(optarg);
+			if (pwd == NULL)
+				errx(1, "%s: no such user", optarg);
+			uid = pwd->pw_uid;
+			endpwent();
+			xflg++;		/* XXX: intuitive? */
+			break;
 		case 'u':
 			parsefmt(ufmt);
 			sortby = SORTCPU;
@@ -271,7 +281,8 @@ main(argc, argv)
 	if (!fmt)
 		parsefmt(dfmt);
 
-	if (!all && ttydev == NODEV && pid == -1)  /* XXX - should be cleaner */
+	/* XXX - should be cleaner */
+	if (!all && ttydev == NODEV && pid == -1 && uid == (uid_t)-1)
 		uid = getuid();
 
 	/*
@@ -501,7 +512,7 @@ usage()
 
 	(void)fprintf(stderr,
 	    "usage:\t%s\n\t   %s\n\t%s\n",
-	    "ps [-aChjlmrSTuvwx] [-O|o fmt] [-p pid] [-t tty]",
+	    "ps [-aChjlmrSTuvwx] [-O|o fmt] [-p pid] [-t tty] [-U user]",
 	    "[-M core] [-N system] [-W swap]",
 	    "ps [-L]");
 	exit(1);

bin/rcp/rcp.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: rcp.c,v 1.3 1995/03/19 13:29:14 joerg Exp $
+ *	$Id: rcp.c,v 1.4.4.2 1996/06/05 02:36:15 jkh Exp $
  */
 
 #ifndef lint
@@ -69,7 +69,7 @@ static char sccsid[] = "@(#)rcp.c	8.2 (Berkeley) 4/2/94";
 #include "extern.h"
 
 #ifdef KERBEROS
-#include <kerberosIV/des.h>
+#include <des.h>
 #include <kerberosIV/krb.h>
 
 char	dst_realm_buf[REALM_SZ];

bin/rm/rm.1

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rm.1	8.2 (Berkeley) 4/18/94
-.\"	$Id$
+.\"	$Id: rm.1,v 1.2 1994/09/24 02:57:00 davidg Exp $
 .\"
 .Dd April 18, 1994
 .Dt RM 1

bin/rm/rm.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: rm.c,v 1.5 1994/09/24 02:57:02 davidg Exp $
+ *	$Id: rm.c,v 1.6 1995/04/13 13:35:09 ache Exp $
  */
 
 #ifndef lint

bin/rmail/rmail.c

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

bin/sh/Makefile

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
-#	$Id: Makefile,v 1.6 1994/09/24 02:57:18 davidg Exp $
+#	$Id: Makefile,v 1.7.6.3 1996/06/05 02:36:21 jkh Exp $
 
 PROG=	sh
 SRCS=	alias.c builtins.c cd.c echo.c error.c eval.c exec.c expand.c \
@@ -11,6 +11,8 @@ DPADD=  ${LIBL} ${LIBEDIT} ${LIBTERMCAP}
 LDADD=  -ll -ledit -ltermcap
 LFLAGS= -8	# 8-bit lex scanner for arithmetic
 CFLAGS+=-DSHELL -I. -I${.CURDIR}
+# for debugging:
+#CFLAGS+=-g -DDEBUG=2
 .PATH:	${.CURDIR}/bltin ${.CURDIR}/../../usr.bin/printf
 CLEANFILES+=\
 	builtins.c builtins.h init.c mkinit mknodes mksignames mksyntax \
@@ -21,6 +23,9 @@ CLEANFILES+=\
 token.def: mktokens
 	sh ${.CURDIR}/mktokens
 
+${.CURDIR}/builtins:
+	# just override the default rule
+
 builtins.h builtins.c: ${.CURDIR}/mkbuiltins ${.CURDIR}/builtins
 	cd ${.CURDIR}; sh mkbuiltins
 

bin/sh/bltin/bltin.h

@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)bltin.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: bltin.h,v 1.2.6.1 1995/12/11 23:05:26 joerg Exp $
  */
 
 /*
@@ -47,15 +47,24 @@
 #include "../mystring.h"
 #ifdef SHELL
 #include "../output.h"
+#undef stdout
 #define stdout out1
+#undef stderr
 #define stderr out2
 #define printf out1fmt
+#undef putc
 #define putc(c, file)	outc(c, file)
+#undef putchar
 #define putchar(c)	out1c(c)
 #define fprintf outfmt
 #define fputs outstr
 #define fflush flushout
 #define INITARGS(argv)
+#define warnx(a, b, c) {                                               \
+       char buf[64];                                                   \
+       (void)snprintf(buf, sizeof(buf), a, b, c);                       \
+       error(buf);                                                     \
+}
 #else
 #undef NULL
 #include <stdio.h>

bin/sh/bltin/echo.c

@@ -34,13 +34,16 @@
  * SUCH DAMAGE.
  *
  *	@(#)echo.c	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: echo.c,v 1.2 1994/09/24 02:58:29 davidg Exp $
  */
 
 /*
  * Echo command.
  */
 
+#ifdef main
+#undef main
+#endif
 #define main echocmd
 
 #include "bltin.h"

bin/sh/builtins

@@ -35,7 +35,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)builtins	8.1 (Berkeley) 5/31/93
-#	$Id$
+#	$Id: builtins,v 1.3 1995/10/19 18:42:09 joerg Exp $
 
 #
 # This file lists all the builtin commands.  The first column is the name
@@ -83,6 +83,7 @@ setvarcmd	setvar
 shiftcmd	shift
 trapcmd		trap
 truecmd		: true
+ulimitcmd	ulimit
 umaskcmd	umask
 unaliascmd	unalias
 unsetcmd	unset

bin/sh/cd.c

@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cd.c,v 1.3 1994/11/06 01:29:26 jkh Exp $
+ *	$Id: cd.c,v 1.5 1995/11/14 01:04:52 peter Exp $
  */
 
 #ifndef lint
@@ -92,7 +92,10 @@ cdcmd(argc, argv)  char **argv; {
 		dest = ".";
 	if (dest[0] == '-' && dest[1] == '\0') {
 		dest = prevdir ? prevdir : curdir;
-		print = 1;
+		if (dest)
+			print = 1;
+		else
+			dest = ".";
 	}
 	if (*dest == '/' || (path = bltinlookup("CDPATH", 1)) == NULL)
 		path = nullstr;

bin/sh/eval.c

@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: eval.c,v 1.2 1994/09/24 02:57:29 davidg Exp $
+ *	$Id: eval.c,v 1.3 1995/05/30 00:07:11 rgrimes Exp $
  */
 
 #ifndef lint
@@ -851,7 +851,8 @@ prehash(n)
 	{
 	struct cmdentry entry;
 
-	if (n->type == NCMD && goodname(n->ncmd.args->narg.text))
+	if (n->type == NCMD && n->ncmd.args &&
+	    goodname(n->ncmd.args->narg.text))
 		find_command(n->ncmd.args->narg.text, &entry, 0);
 }
 

bin/sh/input.c

@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: input.c,v 1.2 1994/09/24 02:57:39 davidg Exp $
+ *	$Id: input.c,v 1.4 1995/11/03 18:50:14 peter Exp $
  */
 
 #ifndef lint
@@ -65,6 +65,7 @@ struct strpush {
 	struct strpush *prev;	/* preceding string on stack */
 	char *prevstring;
 	int prevnleft;
+	int prevlleft;
 	struct alias *ap;	/* if push was associated with an alias */
 };
 
@@ -78,7 +79,8 @@ struct parsefile {
 	struct parsefile *prev;	/* preceding file on stack */
 	int linno;		/* current line */
 	int fd;			/* file descriptor (or -1 if string) */
-	int nleft;		/* number of chars left in buffer */
+	int nleft;		/* number of chars left in line */
+	int lleft;		/* number of lines left in buffer */
 	char *nextc;		/* next char in buffer */
 	char *buf;		/* input buffer */
 	struct strpush *strpush; /* for pushing strings at this level */
@@ -88,12 +90,11 @@ struct parsefile {
 
 int plinno = 1;			/* input line number */
 MKINIT int parsenleft;		/* copy of parsefile->nleft */
+MKINIT int parselleft;		/* copy of parsefile->lleft */
 char *parsenextc;		/* copy of parsefile->nextc */
 MKINIT struct parsefile basepf;	/* top level input file */
 char basebuf[BUFSIZ];		/* buffer for top level input file */
 struct parsefile *parsefile = &basepf;	/* current input file */
-char *pushedstring;		/* copy of parsenextc when text pushed back */
-int pushednleft;		/* copy of parsenleft when text pushed back */
 int init_editline = 0;		/* editline library initialized? */
 int whichprompt;		/* 1 == PS1, 2 == PS2 */
 
@@ -119,7 +120,7 @@ INIT {
 
 RESET {
 	if (exception != EXSHELLPROC)
-		parsenleft = 0;            /* clear input buffer */
+		parselleft = parsenleft = 0;	/* clear input buffer */
 	popallfiles();
 }
 
@@ -168,54 +169,31 @@ pgetc() {
 	return pgetc_macro();
 }
 
+static int
+pread()
+{
+	int nr;
 
-/*
- * Refill the input buffer and return the next input character:
- *
- * 1) If a string was pushed back on the input, pop it;
- * 2) If an EOF was pushed back (parsenleft == EOF_NLEFT) or we are reading
- *    from a string so we can't refill the buffer, return EOF.
- * 3) Call read to read in the characters.
- * 4) Delete all nul characters from the buffer.
- */
-
-int
-preadbuffer() {
-	register char *p, *q;
-	register int i;
-	register int something;
-	extern EditLine *el;
-
-	if (parsefile->strpush) {
-		popstring();
-		if (--parsenleft >= 0)
-			return (*parsenextc++);
-	}
-	if (parsenleft == EOF_NLEFT || parsefile->buf == NULL)
-		return PEOF;
-	flushout(&output);
-	flushout(&errout);
+	parsenextc = parsefile->buf;
 retry:
-	p = parsenextc = parsefile->buf;
 	if (parsefile->fd == 0 && el) {
 		const char *rl_cp;
 		int len;
 
-		rl_cp = el_gets(el, &len);
-		if (rl_cp == NULL) {
-			i = 0;
-			goto eof;
+		rl_cp = el_gets(el, &nr);
+		if (rl_cp == NULL)
+			nr = 0;
+		else {
+			/* XXX - BUFSIZE should redesign so not necessary */
+			strcpy(parsenextc, rl_cp);
 		}
-		strcpy(p, rl_cp);  /* XXX - BUFSIZE should redesign so not necessary */
-		i = len;
 
 	} else {
-regular_read:
-		i = read(parsefile->fd, p, BUFSIZ - 1);
+		nr = read(parsefile->fd, parsenextc, BUFSIZ - 1);
 	}
-eof:
-	if (i <= 0) {
-                if (i < 0) {
+
+	if (nr <= 0) {
+                if (nr < 0) {
                         if (errno == EINTR)
                                 goto retry;
                         if (parsefile->fd == 0 && errno == EWOULDBLOCK) {
@@ -229,57 +207,100 @@ eof:
                                 }
                         }
                 }
-                parsenleft = EOF_NLEFT;
-                return PEOF;
+		nr = -1;
 	}
-	parsenleft = i - 1;	/* we're returning one char in this call */
+	return nr;
+}
+
+/*
+ * Refill the input buffer and return the next input character:
+ *
+ * 1) If a string was pushed back on the input, pop it;
+ * 2) If an EOF was pushed back (parsenleft == EOF_NLEFT) or we are reading
+ *    from a string so we can't refill the buffer, return EOF.
+ * 3) If there is more in the buffer, use it; else call read to fill it.
+ * 4) Process input up to next newline, deleting nul characters.
+ */
+
+int
+preadbuffer() {
+	char *p, *q;
+	int more;
+	int something;
+	extern EditLine *el;
+	char savec;
+
+	if (parsefile->strpush) {
+		popstring();
+		if (--parsenleft >= 0)
+			return (*parsenextc++);
+	}
+	if (parsenleft == EOF_NLEFT || parsefile->buf == NULL)
+		return PEOF;
+	flushout(&output);
+	flushout(&errout);
+
+again:
+	if (parselleft <= 0) {
+		if ((parselleft = pread()) == -1) {
+			parselleft = parsenleft = EOF_NLEFT;
+			return PEOF;
+		}
+	}
+
+	q = p = parsenextc;
 
 	/* delete nul characters */
 	something = 0;
-	for (;;) {
-		if (*p == '\0')
+	for (more = 1; more;) {
+		switch (*p) {
+		case '\0':
+			p++;	/* Skip nul */
+			goto check;
+
+		case '\t':
+		case ' ':
 			break;
-		if (*p != ' ' && *p != '\t' && *p != '\n')
+
+		case '\n':
+			parsenleft = q - parsenextc;
+			more = 0; /* Stop processing here */
+			break;
+
+		default:
 			something = 1;
-		p++;
-		if (--i <= 0) {
-			*p = '\0';
-			goto done;		/* no nul characters */
+			break;
+		}
+
+		*q++ = *p++;
+check:
+		if (--parselleft <= 0) {
+			parsenleft = q - parsenextc - 1;
+			if (parsenleft < 0)
+				goto again;
+			*q = '\0';
+			more = 0;
 		}
 	}
-	/*
-	 * remove nuls
-	 */
-	q = p++;
-	while (--i > 0) {
-		if (*p != '\0')
-			*q++ = *p;
-		p++;
-	}
-	*q = '\0';
-	if (q == parsefile->buf)
-		goto retry;			/* buffer contained nothing but nuls */
-	parsenleft = q - parsefile->buf - 1;
 
-done:
+	savec = *q;
+	*q = '\0';
+
+
 	if (parsefile->fd == 0 && hist && something) {
 		INTOFF;
-		history(hist, whichprompt == 1 ? H_ENTER : H_ADD,
-			   parsefile->buf);
+		history(hist, whichprompt == 1 ? H_ENTER : H_ADD, parsenextc);
 		INTON;
 	}
+
+
 	if (vflag) {
-		/*
-		 * This isn't right.  Most shells coordinate it with
-		 * reading a line at a time.  I honestly don't know if its
-		 * worth it.
-		 */
-		i = parsenleft + 1;
-		p = parsefile->buf;
-		for (; i--; p++)
-			out2c(*p)
+		out2str(parsenextc);
 		flushout(out2);
 	}
+
+	*q = savec;
+
 	return *parsenextc++;
 }
 
@@ -316,6 +337,7 @@ pushstring(s, len, ap)
 		sp = parsefile->strpush = &(parsefile->basestrpush);
 	sp->prevstring = parsenextc;
 	sp->prevnleft = parsenleft;
+	sp->prevlleft = parselleft;
 	sp->ap = (struct alias *)ap;
 	if (ap)
 		((struct alias *)ap)->flag |= ALIASINUSE;
@@ -331,6 +353,7 @@ popstring()
 	INTOFF;
 	parsenextc = sp->prevstring;
 	parsenleft = sp->prevnleft;
+	parselleft = sp->prevlleft;
 /*dprintf("*** calling popstring: restoring to '%s'\n", parsenextc);*/
 	if (sp->ap)
 		sp->ap->flag &= ~ALIASINUSE;
@@ -383,7 +406,7 @@ setinputfd(fd, push) {
 	parsefile->fd = fd;
 	if (parsefile->buf == NULL)
 		parsefile->buf = ckmalloc(BUFSIZ);
-	parsenleft = 0;
+	parselleft = parsenleft = 0;
 	plinno = 1;
 }
 
@@ -400,7 +423,7 @@ setinputstring(string, push)
 	if (push)
 		pushfile();
 	parsenextc = string;
-	parsenleft = strlen(string);
+	parselleft = parsenleft = strlen(string);
 	parsefile->buf = NULL;
 	plinno = 1;
 	INTON;
@@ -418,6 +441,7 @@ pushfile() {
 	struct parsefile *pf;
 
 	parsefile->nleft = parsenleft;
+	parsefile->lleft = parselleft;
 	parsefile->nextc = parsenextc;
 	parsefile->linno = plinno;
 	pf = (struct parsefile *)ckmalloc(sizeof (struct parsefile));
@@ -443,6 +467,7 @@ popfile() {
 	parsefile = pf->prev;
 	ckfree(pf);
 	parsenleft = parsefile->nleft;
+	parselleft = parsefile->lleft;
 	parsenextc = parsefile->nextc;
 	plinno = parsefile->linno;
 	INTON;

bin/sh/jobs.c

@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: jobs.c,v 1.2 1994/09/24 02:57:41 davidg Exp $
+ *	$Id: jobs.c,v 1.4 1995/09/21 13:24:20 bde Exp $
  */
 
 #ifndef lint
@@ -459,7 +459,14 @@ makejob(node, nprocs)
 			if (njobs == 0) {
 				jobtab = ckmalloc(4 * sizeof jobtab[0]);
 			} else {
+				struct job *ojp;
+
 				jp = ckmalloc((njobs + 4) * sizeof jobtab[0]);
+				for (i = njobs, ojp = jobtab; --i >= 0;
+				     jp++, ojp++)
+					if (ojp->ps == &ojp->ps0)
+						ojp->ps = &jp->ps0;
+				jp -= njobs;
 				bcopy(jobtab, jp, njobs * sizeof jp[0]);
 				ckfree(jobtab);
 				jobtab = jp;

bin/sh/miscbltin.c

@@ -4,6 +4,7 @@
  *
  * This code is derived from software contributed to Berkeley by
  * Kenneth Almquist.
+ * The ulimit() builtin has been contributed by Joerg Wunsch.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -33,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: miscbltin.c,v 1.4 1995/10/21 00:47:30 joerg Exp $
  */
 
 #ifndef lint
@@ -52,6 +53,18 @@ static char sccsid[] = "@(#)miscbltin.c	8.2 (Berkeley) 4/16/94";
 #include "error.h"
 #include "mystring.h"
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+#if BSD
+#include <limits.h>
+#include <sys/types.h>
+#include <sys/time.h>
+#include <sys/resource.h>
+#endif
+
 #undef eflag
 
 extern char **argptr;		/* argument list for builtin command */
@@ -166,3 +179,203 @@ umaskcmd(argc, argv)  char **argv; {
 	}
 	return 0;
 }
+
+
+#if BSD
+struct restab {
+	int resource;
+	int scale;
+	char *descript;
+};
+
+/* multi-purpose */
+#define RLIMIT_UNSPEC (-2)
+
+/* resource */
+#define RLIMIT_ALL (-1)
+
+/* mode */
+#define RLIMIT_SHOW 0
+#define RLIMIT_SET 1
+
+/* what */
+#define RLIMIT_SOFT 1
+#define RLIMIT_HARD 2
+
+static struct restab restab[] = {
+	{RLIMIT_CORE,     512,  "coredump(512-blocks)    "},
+	{RLIMIT_CPU,      1,    "time(seconds)           "},
+	{RLIMIT_DATA,     1024, "datasize(kilobytes)     "},
+	{RLIMIT_FSIZE,    512,  "filesize(512-blocks)    "},
+	{RLIMIT_MEMLOCK,  1024, "lockedmem(kilobytes)    "},
+	{RLIMIT_NOFILE,   1,    "nofiles(descriptors)    "},
+	{RLIMIT_NPROC,    1,    "userprocs(max)          "},
+	{RLIMIT_RSS,      1024, "memoryuse(kilobytes)    "},
+	{RLIMIT_STACK,    1024, "stacksize(kilobytes)    "}
+};
+
+/* get entry into above table */
+static struct restab *
+find_resource(resource) {
+	int i;
+	struct restab *rp;
+
+	for(i = 0, rp = restab;
+	    i < sizeof restab / sizeof(struct restab);
+	    i++, rp++)
+		if(rp->resource == resource)
+			return rp;
+	error("internal error: resource not in table");
+	return 0;
+}
+
+static void
+print_resource(rp, what, with_descript) struct restab *rp; {
+	struct rlimit rlim;	
+	quad_t val;
+
+	(void)getrlimit(rp->resource, &rlim);
+	val = (what == RLIMIT_SOFT)?
+		rlim.rlim_cur: rlim.rlim_max;
+	if(with_descript)
+		out1str(rp->descript);
+	if(val == RLIM_INFINITY)
+		out1str("unlimited\n");
+	else {
+		val /= (quad_t)rp->scale;
+		if(val > (quad_t)ULONG_MAX)
+			out1fmt("> %lu\n", (unsigned long)ULONG_MAX);
+		else
+			out1fmt("%lu\n", (unsigned long)val);
+	}
+}
+
+ulimitcmd(argc, argv)  char **argv; {
+	struct rlimit rlim;
+	char *p;
+	int i;
+	int resource = RLIMIT_UNSPEC;
+	quad_t val;
+	int what = RLIMIT_UNSPEC;
+	int mode = RLIMIT_UNSPEC;
+	int errs = 0, arg = 1;
+	struct restab *rp;
+	extern int optreset;	/* XXX should be declared in <stdlib.h> */
+
+	opterr = 0;		/* use own error processing */
+	optreset = 1;
+	optind = 1;
+	while ((i = getopt(argc, argv, "HSacdfnstmlu")) != EOF) {
+		arg++;
+		switch(i) {
+		case 'H':
+			if(what == RLIMIT_UNSPEC) what = 0;
+			what |= RLIMIT_HARD;
+			break;
+		case 'S':
+			if(what == RLIMIT_UNSPEC) what = 0;
+			what |= RLIMIT_SOFT;
+			break;
+		case 'a':
+			if(resource != RLIMIT_UNSPEC) errs++;
+			resource = RLIMIT_ALL;
+			mode = RLIMIT_SHOW;
+			break;
+		case 'c':
+			if(resource != RLIMIT_UNSPEC) errs++;
+			resource = RLIMIT_CORE;
+			break;
+		case 'd':
+			if(resource != RLIMIT_UNSPEC) errs++;
+			resource = RLIMIT_DATA;
+			break;
+		case 'f':
+			if(resource != RLIMIT_UNSPEC) errs++;
+			resource = RLIMIT_FSIZE;
+			break;
+		case 'n':
+			if(resource != RLIMIT_UNSPEC) errs++;
+			resource = RLIMIT_NOFILE;
+			break;
+		case 's':
+			if(resource != RLIMIT_UNSPEC) errs++;
+			resource = RLIMIT_STACK;
+			break;
+		case 't':
+			if(resource != RLIMIT_UNSPEC) errs++;
+			resource = RLIMIT_CPU;
+			break;
+		case 'm':
+			if(resource != RLIMIT_UNSPEC) errs++;
+			resource = RLIMIT_RSS;
+			break;
+		case 'l':
+			if(resource != RLIMIT_UNSPEC) errs++;
+			resource = RLIMIT_MEMLOCK;
+			break;
+		case 'u':
+			if(resource != RLIMIT_UNSPEC) errs++;
+			resource = RLIMIT_NPROC;
+			break;
+		case '?':
+			error("illegal option -%c", optopt);
+		}
+	}
+
+	argc -= optind;
+	argv += optind;
+	if(argc > 1)
+		error("too many arguments");
+	if(argc == 0)
+		mode = RLIMIT_SHOW;
+	else if (resource == RLIMIT_ALL)
+		errs++;
+	else
+		mode = RLIMIT_SET;
+	if(mode == RLIMIT_UNSPEC)
+		mode = RLIMIT_SHOW;
+	if(resource == RLIMIT_UNSPEC)
+		resource = RLIMIT_FSIZE;
+	if(what == RLIMIT_UNSPEC)
+		what = (mode == RLIMIT_SHOW)?
+			RLIMIT_SOFT: (RLIMIT_SOFT|RLIMIT_HARD);
+	if(mode == RLIMIT_SHOW && what == (RLIMIT_SOFT|RLIMIT_HARD))
+		errs++;
+	if(errs)
+		error("Wrong option combination");
+	
+	if(resource == RLIMIT_ALL)
+		for(i = 0; i < sizeof restab / sizeof(struct restab); i++)
+			print_resource(restab + i, what, 1);
+	else if(mode == RLIMIT_SHOW)
+		print_resource(find_resource(resource), what, 0);
+	else {
+		rp = find_resource(resource);
+		if(strcmp(argv[0], "unlimited") == 0)
+			val = RLIM_INFINITY;
+		else {
+			val = 0;
+			p = argv[0];
+			do {
+				if((i = *p - '0') < 0 || i > 9)
+					error("Illegal number: %s", argv[0]);
+				val = (10 * val) + (quad_t)i;
+			} while (*++p != '\0');
+			val *= (quad_t)rp->scale;
+		}
+		(void)getrlimit(resource, &rlim);
+		if(what & RLIMIT_HARD)
+			rlim.rlim_max = val;
+		if(what & RLIMIT_SOFT)
+			rlim.rlim_cur = val;
+		if(setrlimit(resource, &rlim) == -1) {
+			outfmt(&errout, "ulimit: bad limit: %s\n",
+			       strerror(errno));
+			return 1;
+		}
+	}
+	return 0;
+}
+#else /* !BSD */
+#error ulimit() not implemented
+#endif /* BSD */

bin/sh/mkinit.c

@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mkinit.c,v 1.3 1994/11/06 06:27:04 pst Exp $
+ *	$Id: mkinit.c,v 1.5 1995/10/01 15:13:31 joerg Exp $
  */
 
 #ifndef lint
@@ -198,7 +198,7 @@ readfile(fname)
 	char *fname;
 	{
 	FILE *fp;
-	char line[1024];
+	char line[1024], line2[1024];
 	struct event *ep;
 
 	fp = ckfopen(fname, "r");
@@ -217,8 +217,20 @@ readfile(fname)
 			doinclude(line);
 		if (line[0] == 'M' && match("MKINIT", line))
 			dodecl(line, fp);
-		if (line[0] == '#' && gooddefine(line))
+		if (line[0] == '#' && gooddefine(line)) {
+			char *cp;
+
+			strcpy(line2, line);
+			memcpy(line2, "#undef ", strlen("#undef "));
+			cp = line2 + strlen("#undef ");
+			while(*cp && (*cp == ' ' || *cp == '\t'))
+				cp++;
+			while(*cp && *cp != ' ' && *cp != '\t' && *cp != '\n')
+				cp++;
+			*cp++ = '\n'; *cp = '\0';
+			addstr(line2, &defines);
 			addstr(line, &defines);
+		}
 	}
 	fclose(fp);
 }

bin/sh/options.c

@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: options.c,v 1.2 1994/09/24 02:58:04 davidg Exp $
+ *	$Id: options.c,v 1.3.4.2 1995/10/02 07:55:18 davidg Exp $
  */
 
 #ifndef lint
@@ -106,6 +106,9 @@ procargs(argc, argv)
 		commandname = arg0 = *argptr++;
 		setinputfile(commandname, 0);
 	}
+	if (*argptr && minusc)
+		/* Posix.2: first arg after -c cmd is $0, remainder $1... */
+		arg0 = *argptr++;
 	shellparam.p = argptr;
 	/* assert(shellparam.malloc == 0 && shellparam.nparam == 0); */
 	while (*argptr) {
@@ -374,12 +377,11 @@ atend:
 			q++;
 	}
 	if (*++q == ':') {
-		if (*p == '\0' && (p = *shellparam.optnext) == NULL) {
+		if (*p == '\0' && (p = *shellparam.optnext++) == NULL) {
 			out1fmt("No arg for -%c option\n", c);
 			c = '?';
 			goto out;
 		}
-		shellparam.optnext++;
 		setvar("OPTARG", p, 0);
 		p = NULL;
 	}

bin/sh/parser.c

@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: parser.c,v 1.5 1995/01/11 07:07:00 paul Exp $
+ *	$Id: parser.c,v 1.6.4.4 1996/06/05 02:36:22 jkh Exp $
  */
 
 #ifndef lint
@@ -150,29 +150,12 @@ list(nlflag) {
 	for (;;) {
 		switch (readtoken()) {
 		case TBACKGND:
-			if (n1->type == NCMD || n1->type == NPIPE) {
-				n1->ncmd.backgnd = 1;
-			} else if (n1->type == NREDIR) {
-				n1->type = NBACKGND;
-			} else {
-				n3 = (union node *)stalloc(sizeof (struct nredir));
-				n3->type = NBACKGND;
-				n3->nredir.n = n1;
-				n3->nredir.redirect = NULL;
-				n1 = n3;
-			}
-			goto tsemi;
 		case TNL:
-			tokpushback++;
+			parseheredoc();
+			if (nlflag)
+				return n1;
 			/* fall through */
-tsemi:	    case TSEMI:
-			if (readtoken() == TNL) {
-				parseheredoc();
-				if (nlflag)
-					return n1;
-			} else {
-				tokpushback++;
-			}
+		case TSEMI:
 			checkkwd = 2;
 			if (tokendlist[peektoken()])
 				return n1;
@@ -212,6 +195,19 @@ andor() {
 		} else if (t == TOR) {
 			t = NOR;
 		} else {
+			if (t == TBACKGND) {
+				if (n1->type == NCMD || n1->type == NPIPE) {
+					n1->ncmd.backgnd = 1;
+				} else if (n1->type == NREDIR) {
+					n1->type = NBACKGND;
+				} else {
+					n3 = (union node *)stalloc(sizeof (struct nredir));
+					n3->type = NBACKGND;
+					n3->nredir.n = n1;
+					n3->nredir.redirect = NULL;
+					n1 = n3;
+				}
+			}
 			tokpushback++;
 			return n1;
 		}
@@ -442,7 +438,12 @@ TRACE(("expecting DO got %s %s\n", tokname[got], got == TWORD ? wordtext : ""));
 		checkkwd = 1;
 		break;
 	/* Handle an empty command like other simple commands.  */
+	case TAND:
+	case TOR:
 	case TNL:
+	case TSEMI:
+	/* Handle EOF as an empty command, too */
+	case TEOF:
 	case TWORD:
 		tokpushback++;
 		return simplecmd(rpp, redir);
@@ -1179,6 +1180,10 @@ parsebackq: {
 
                 STARTSTACKSTR(out);
                 while ((c = pgetc ()) != '`') {
+                       if (c == PEOF) {
+                                startlinno = plinno;
+                                synerror("EOF in backquote substitution");
+                       }
                        if (c == '\\') {
                                 c = pgetc ();
                                 if ( c != '\\' && c != '`' && c != '$'

bin/sh/redir.c

@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: redir.c,v 1.2 1994/09/24 02:58:10 davidg Exp $
+ *	$Id: redir.c,v 1.4 1995/10/21 00:47:31 joerg Exp $
  */
 
 #ifndef lint
@@ -120,6 +120,9 @@ redirect(redir, flags)
 	}
 	for (n = redir ; n ; n = n->nfile.next) {
 		fd = n->nfile.fd;
+		if ((n->nfile.type == NTOFD || n->nfile.type == NFROMFD) &&
+		    n->ndup.dupfd == fd)
+			continue; /* redirect from/to myself */
 		if ((flags & REDIR_PUSH) && sv->renamed[fd] == EMPTY) {
 			INTOFF;
 			if ((i = copyfd(fd, 10)) != EMPTY) {
@@ -341,5 +344,7 @@ copyfd(from, to) {
 	newfd = fcntl(from, F_DUPFD, to);
 	if (newfd < 0 && errno == EMFILE)
 		return EMPTY;
+	if (newfd < 0)
+		error("%d: %s", from, strerror(errno));
 	return newfd;
 }

bin/sh/sh.1

@@ -33,7 +33,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sh.1	8.4 (Berkeley) 4/18/94
-.\"	$Id: sh.1,v 1.2 1994/09/24 02:58:13 davidg Exp $
+.\"	$Id: sh.1,v 1.5 1995/10/21 00:47:32 joerg Exp $
+.\"
+.\"
 .\"
 .na
 .TH SH 1
@@ -1277,6 +1279,56 @@ resets trapped (but not ignored) signals to the
 default action. The trap command has no effect on
 signals that were ignored on entry to the shell.
 .TP
+ulimit [ -HSacdflmnpst ] [ limit ]
+Set or display resource limits (see getrlimit(2)).
+If ``limit'' is specified, the named resource will be set;
+otherwise the current resource value will be displayed.
+.br
+If ``-H'' is specified, the hard limits will be
+set or displayed.  While everybody is allowed to reduce a
+hard limit, only the superuser can increase it.  Option ``-S''
+specifies the soft limits instead.  When displaying limits,
+only one of ``-S'' or ``-H'' can be given.  The default is
+to display the soft limits, and to set both, the hard and
+the soft limits.
+.br
+Option ``-a'' requests to display all resources.  The parameter
+``limit'' is not acceptable in this mode.
+.br
+The remaining options specify which resource value is to be
+displayed or modified.  They are mutually exclusive.
+.RS +.7i
+.TP 2
+-c coredumpsize
+The maximal size of core dump files, in 512-byte blocks.
+.TP 2
+-d datasize
+The maximal size of the data segment of a process, in kilobytes.
+.TP 2
+-f filesize
+The maximal size of a file, in 512-byte blocks.  This is the
+default.
+.TP 2
+-l lockedmem
+The maximal size of memory that can be locked by a process, in
+kilobytes.
+.TP 2
+-m memoryuse
+The maximal resident set size of a process, in kilobytes.
+.TP 2
+-n nofiles
+The maximal number of descriptors that could be opened by a process.
+.TP 2
+-u userproc
+The maximal number of simultaneous processes for this user ID.
+.TP 2
+-s stacksize
+The maximal size of the stack segment, in kilobytes.
+.TP 2
+-t time
+The maximal amount of CPU time to be used by each process, in seconds.
+.RE
+.TP
 umask [ mask ]
 Set the value of umask (see umask(2)) to the specified octal value.
 If the argument is omitted, the

bin/sh/shell.h

@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)shell.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ *	$Id: shell.h,v 1.2 1994/09/24 02:58:15 davidg Exp $
  */
 
 /*
@@ -57,7 +57,7 @@
 #ifndef BSD
 #define BSD 1
 #endif
-#define DEBUG 1
+/* #define DEBUG 1 */
 
 #ifdef __STDC__
 typedef void *pointer;

bin/stty/stty.1

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)stty.1	8.4 (Berkeley) 4/18/94
-.\"	$Id$
+.\"	$Id: stty.1,v 1.2.6.2 1996/06/05 02:36:26 jkh Exp $
 .\"
 .Dd April 18, 1994
 .Dt STTY 1
@@ -160,10 +160,10 @@ Signal (do not signal)
 on
 break.
 .It Cm ignpar Pq Fl ignpar
-Ignore (do not ignore) parity
+Ignore (do not ignore) characters with parity
 errors.
 .It Cm parmrk Pq Fl parmrk
-Mark (do not mark) parity errors.
+Mark (do not mark) characters with parity errors.
 .It Cm inpck Pq Fl inpck
 Enable (disable) input parity
 checking.
@@ -235,7 +235,7 @@ output modes).
 Map (do not map)
 .Dv NL
 to
-.DV CR-NL
+.Dv CR-NL
 on output.
 .It Cm oxtabs Pq Fl oxtabs
 Expand (do not expand) tabs to spaces on output.

bin/stty/stty.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: stty.c,v 1.3 1995/04/29 15:00:34 bde Exp $
+ *	$Id: stty.c,v 1.4 1995/05/30 00:07:28 rgrimes Exp $
  */
 
 #ifndef lint
@@ -95,10 +95,10 @@ main(argc, argv)
 args:	argc -= optind;
 	argv += optind;
 
+	if (tcgetattr(i.fd, &i.t) < 0)
+		errx(1, "stdin isn't a terminal");
 	if (ioctl(i.fd, TIOCGETD, &i.ldisc) < 0)
 		err(1, "TIOCGETD");
-	if (tcgetattr(i.fd, &i.t) < 0)
-		err(1, "tcgetattr");
 	if (ioctl(i.fd, TIOCGWINSZ, &i.win) < 0)
 		warn("TIOCGWINSZ: %s\n", strerror(errno));
 

bin/stty/util.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: util.c,v 1.2 1994/09/24 02:59:05 davidg Exp $
  */
 
 #ifndef lint
@@ -62,5 +62,5 @@ checkredirect()
 	if (isatty(STDOUT_FILENO) && isatty(STDERR_FILENO) &&
 	    !fstat(STDOUT_FILENO, &sb1) && !fstat(STDERR_FILENO, &sb2) &&
 	    (sb1.st_rdev != sb2.st_rdev))
-warn("stdout appears redirected, but stdin is the control descriptor");
+warnx("stdout appears redirected, but stdin is the control descriptor");
 }

bin/sync/sync.8

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sync.8	8.1 (Berkeley) 5/31/93
-.\"	$Id$
+.\"	$Id: sync.8,v 1.2 1994/09/24 02:59:08 davidg Exp $
 .\"
 .Dd May 31, 1993
 .Dt SYNC 8

bin/test/test.c

@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: test.c,v 1.10 1995/03/19 13:29:28 joerg Exp $
+ *	$Id: test.c,v 1.11.4.1 1996/02/20 09:48:53 jkh Exp $
  */
 
 #ifndef lint
@@ -388,7 +388,7 @@ permission:		if (fs->stat.st_uid == geteuid())
 		goto filetype;
 	case ISSYMLINK:
 		i = S_IFLNK;
-		(void)lstat(sp->u.string, &fs->stat);
+		fs->rcode = lstat(sp->u.string, &fs->stat);
 		goto filetype;
 	case ISFIFO:
 		i = S_IFIFO;
@@ -578,12 +578,12 @@ static void
 syntax()
 {
 
-	err(2, "syntax error");
+	errx(2, "syntax error");
 }
 
 static void
 overflow()
 {
 
-	err(2, "expression is too complex");
+	errx(2, "expression is too complex");
 }

eBones/ARTISTIC.libdes

@@ -1,105 +0,0 @@
-
-			 The "Artistic License"
-
-				Preamble
-
-The intent of this document is to state the conditions under which a
-Package may be copied, such that the Copyright Holder maintains some
-semblance of artistic control over the development of the package,
-while giving the users of the package the right to use and distribute
-the Package in a more-or-less customary fashion, plus the right to make
-reasonable modifications.
-
-Definitions:
-
-	"Package" refers to the collection of files distributed by the
-	Copyright Holder, and derivatives of that collection of files
-	created through textual modification.
-
-	"Standard Version" refers to such a Package if it has not been
-	modified, or has been modified in accordance with the wishes
-	of the Copyright Holder as specified below.
-
-	"Copyright Holder" is whoever is named in the copyright or
-	copyrights for the package.
-
-	"You" is you, if you're thinking about copying or distributing
-	this Package.
-
-	"Reasonable copying fee" is whatever you can justify on the
-	basis of media cost, duplication charges, time of people involved,
-	and so on.  (You will not be required to justify it to the
-	Copyright Holder, but only to the computing community at large
-	as a market that must bear the fee.)
-
-	"Freely Available" means that no fee is charged for the item
-	itself, though there may be fees involved in handling the item.
-	It also means that recipients of the item may redistribute it
-	under the same conditions they received it.
-
-1. You may make and give away verbatim copies of the source form of the
-Standard Version of this Package without restriction, provided that you
-duplicate all of the original copyright notices and associated disclaimers.
-
-2. You may apply bug fixes, portability fixes and other modifications
-derived from the Public Domain or from the Copyright Holder.  A Package
-modified in such a way shall still be considered the Standard Version.
-
-3. You may otherwise modify your copy of this Package in any way, provided
-that you insert a prominent notice in each changed file stating how and
-when you changed that file, and provided that you do at least ONE of the
-following:
-
-    a) place your modifications in the Public Domain or otherwise make them
-    Freely Available, such as by posting said modifications to Usenet or
-    an equivalent medium, or placing the modifications on a major archive
-    site such as uunet.uu.net, or by allowing the Copyright Holder to include
-    your modifications in the Standard Version of the Package.
-
-    b) use the modified Package only within your corporation or organization.
-
-    c) rename any non-standard executables so the names do not conflict
-    with standard executables, which must also be provided, and provide
-    a separate manual page for each non-standard executable that clearly
-    documents how it differs from the Standard Version.
-
-    d) make other distribution arrangements with the Copyright Holder.
-
-4. You may distribute the programs of this Package in object code or
-executable form, provided that you do at least ONE of the following:
-
-    a) distribute a Standard Version of the executables and library files,
-    together with instructions (in the manual page or equivalent) on where
-    to get the Standard Version.
-
-    b) accompany the distribution with the machine-readable source of
-    the Package with your modifications.
-
-    c) give non-standard executables non-standard names, and clearly
-    document the differences in manual pages (or equivalent), together
-    with instructions on where to get the Standard Version.
-
-    d) make other distribution arrangements with the Copyright Holder.
-
-5. You may charge a reasonable copying fee for any distribution of this
-Package.  You may charge any fee you choose for support of this
-Package.  You may not charge a fee for this Package itself.  However,
-you may distribute this Package in aggregate with other (possibly
-commercial) programs as part of a larger (possibly commercial) software
-distribution provided that you do not advertise this Package as a
-product of your own.
-
-6. Any programs linked with this library do not automatically fall
-under the copyright of this Package, but belong to whomever generated
-them, and may be sold commercially, and may be aggregated with this
-Package.
-
-7. The name of the Copyright Holder may not be used to endorse or promote
-products derived from this software without specific prior written permission.
-
-8. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
-				The End
-

eBones/Copyright.MIT

@@ -1,4 +1,4 @@
-#	$Id: Copyright.MIT,v 1.2 1994/07/19 19:21:03 g89r4222 Exp $
+#	$Id: Copyright.MIT,v 1.3 1995/07/18 16:34:16 mark Exp $
 
 The following Copyright notice applies to the original Bones package.
 

eBones/Copyright.SIPB

@@ -1,4 +1,4 @@
-#	$Id: Copyright.SIPB,v 1.2 1994/07/19 19:21:05 g89r4222 Exp $
+#	$Id: Copyright.SIPB,v 1.3 1995/07/18 16:34:18 mark Exp $
 
 The following Copyright notice applies to parts of the Bones package.
 See source code for exact references.

eBones/Makefile

@@ -1,14 +1,7 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.11.2.1 1995/06/07 05:49:26 jkh Exp $
+#	$Id$
 
-SUBDIR=	include des acl kdb krb libkadm
-
-SUBDIR+= ext_srvtab kdb_destroy kdb_edit \
-	 kdb_init kdb_util kdestroy kerberos kinit klist ksrvtgt \
-	 kstash kadmin kadmind ksrvutil man
-#
-# MISSING AND PROBABLY BOGUS: register registerd make_keypair
-#
+SUBDIR=	include lib libexec usr.bin usr.sbin man
 
 SDIR= ${.CURDIR}/..
 
@@ -34,13 +27,10 @@ kprog:
 	cd ${SDIR}/usr.bin/su; ${CODAI}
 
 bootstrap:
-	cd include; ${MAKE} ${MFLAGS} install
+	( cd include; ${MAKE} ${MFLAGS} install )
+	( cd lib; ${MAKE} ${MFLAGS} depend all install )
 	${MAKE} ${MFLAGS} cleandir
 	${MAKE} ${MFLAGS} obj
-	@echo removing old 1.1.5 Kerberos libraries
-	rm -f /usr/lib/libkrb.so.4.0
-	rm -f /usr/lib/libdes.so.4.0
-	rm -f /usr/lib/libkdb.so.4.0
 	${MAKE} ${MFLAGS} depend all install kprog
 
 help-distribute:	distribute
@@ -56,4 +46,3 @@ help-distribute:	distribute
 	cd ${SDIR}/usr.bin/su; ${CODAD}
 
 .include <bsd.subdir.mk>
-

eBones/Makefile.inc

@@ -1,40 +1,63 @@
 #	From: @(#)Makefile.inc	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile.inc,v 1.3 1995/01/14 20:50:37 wollman Exp $
+#	$Id$
 
-BINDIR?=	/usr/sbin
-SHLIB_MAJOR?=	2
-SHLIB_MINOR?=	0
 DISTRIBUTION=	krb
 
-.if exists(${.CURDIR}/../des/obj)
-DESOBJDIR=	${.CURDIR}/../des/obj
+.if exists(${.CURDIR}/../../../secure/lib/libdes/obj)
+DESOBJDIR=	${.CURDIR}/../../../secure/lib/libdes/obj
 .else
-DESOBJDIR=	${.CURDIR}/../des
+DESOBJDIR=	${.CURDIR}/../../../secure/lib/libdes
 .endif
 
-.if exists(${.CURDIR}/../krb/obj)
-KRBOBJDIR=	${.CURDIR}/../krb/obj
+.if exists(${.CURDIR}/../../lib/libkrb/obj)
+KRBOBJDIR=	${.CURDIR}/../../lib/libkrb/obj
 .else
-KRBOBJDIR=	${.CURDIR}/../krb
+KRBOBJDIR=	${.CURDIR}/../../lib/libkrb
 .endif
 
-.if exists(${.CURDIR}/../kdb/obj)
-KDBOBJDIR=	${.CURDIR}/../kdb/obj
+.if exists(${.CURDIR}/../../lib/libkdb/obj)
+KDBOBJDIR=	${.CURDIR}/../../lib/libkdb/obj
 .else
-KDBOBJDIR=	${.CURDIR}/../kdb
+KDBOBJDIR=	${.CURDIR}/../../lib/libkdb
 .endif
 
-.if exists(${.CURDIR}/../acl/obj)
-ACLOBJDIR=	${.CURDIR}/../acl/obj
+.if exists(${.CURDIR}/../../lib/libacl/obj)
+ACLOBJDIR=	${.CURDIR}/../../lib/libacl/obj
 .else
-ACLOBJDIR=	${.CURDIR}/../acl
+ACLOBJDIR=	${.CURDIR}/../../lib/libacl
 .endif
 
-.if exists(${.CURDIR}/../libkadm/obj)
-KADMOBJDIR=	${.CURDIR}/../libkadm/obj
+.if exists(${.CURDIR}/../../lib/libkadm/obj)
+KADMOBJDIR=	${.CURDIR}/../../lib/libkadm/obj
 .else
-KADMOBJDIR=	${.CURDIR}/../libkadm
+KADMOBJDIR=	${.CURDIR}/../../lib/libkadm
 .endif
 
+.if exists(${.CURDIR}/../../lib/librkinit/obj)
+RKINITOBJDIR= ${.CURDIR}/../../lib/librkinit/obj
+.else
+RKINITOBJDIR= ${.CURDIR}/../../lib/librkinit
+.endif
+
+CFLAGS+= -I${.CURDIR}/../../../secure/lib/libdes -I${.CURDIR}/../../include -Wall
+
 COMPILE_ET=     compile_et
 
+${KRBOBJDIR}/krb_err.h: ${.CURDIR}/../../lib/libkrb/krb_err.et          
+	test -e ${KRBOBJDIR}/krb_err.et || ln -s ${.ALLSRC} ${KRBOBJDIR}
+	cd ${KRBOBJDIR}; compile_et krb_err.et
+
+CLEANFILES+=${KRBOBJDIR}/krb_err.h ${KRBOBJDIR}/krb_err.c
+
+${KADMOBJDIR}/kadm_err.h: ${.CURDIR}/../../lib/libkadm/kadm_err.et          
+	test -e ${KADMOBJDIR}/kadm_err.et || ln -s ${.ALLSRC} ${KADMOBJDIR}
+	cd ${KADMOBJDIR}; compile_et kadm_err.et
+
+CLEANFILES+=${KADMOBJDIR}/kadm_err.h ${KADMOBJDIR}/kadm_err.c
+
+${RKINITOBJDIR}/rkinit_err.h: ${.CURDIR}/../../lib/librkinit/rkinit_err.et
+	test -e ${RKINITOBJDIR}/rkinit_err.et || \
+		ln -s ${.ALLSRC} ${RKINITOBJDIR}
+	cd ${RKINITOBJDIR}; compile_et rkinit_err.et
+
+CLEANFILES+=${RKINITOBJDIR}/rkinit_err.h ${RKINITOBJDIR}/rkinit_err.c

eBones/README.PATCH

@@ -0,0 +1,52 @@
+IMPORTANT!
+
+This distribution includes a patch (already applied), that updates
+Kerberos' key generation. The gist of the patch is to replace calls
+to des_random_key() with calls to des_new_random_key().
+
+The primary difference is that des_random_key() uses a seeding
+technique which is predictable and therefore vulnerable.
+des_new_random_key() uses a feedback mechanism based on the Data
+Encryption Standard (DES) and is seeded with a secret (and therefore
+unknown to an attacker) value. This value is the database master
+key, which is a convenient secret value.
+
+This patch uses the new_rnd_key.c key module (which contains the
+definition and code for des_new_random_key()). It has been part of
+the standard Version 4 distribution since 1992 (and was recreated
+for FreeBSD in 1995). This is used in the MIT admin server (the
+primary error at MIT was not upgrading all of Kerberos to use this
+newer generator. This patch finishes the job).
+
+In addition to the patch for the Kerberos distribution this
+distribution also contains a program for changing critical system keys
+(namely the "krbtgt" and "changepw.kerberos" keys). When you
+originally built your Kerberos database these keys were chosen at
+random, using the vulnerable version of the kerberos random number
+generator. Therefore it is possible for an attacker to mount an attack
+to guess these values. If an attacker can determine the key for the
+"krbtgt" ticket, they can construct tickets claiming to be any
+kerberos principal. Similarly if an attacker can obtain the
+"changepw.kerberos" key, they can change anyone's password.
+
+The new "fix_kdb_keys(8)" program, which you run on the KDC
+server, will change these critical keys to new values using the
+newer random number generator. IMPORTANT: When you run fix_kdb_keys,
+all outstanding ticket granting tickets will immediately become
+invalid. This will be disruptive to your user community. We recommend
+that you either do this late at night or early in the morning before
+most users have logged in. Alternatively pre-announce a definitive
+time when you will run the program and inform your users that they
+will have to get new tickets at that time (using either "kinit" or
+simply by logging out and then in again).
+
+NOTE: The only client program modified is "ksrvutil" which is used
+to generate new server keys. All other client/server programs are
+unaffected. End users do *not* need to obtain new versions of
+programs that use Kerberos. This is because most random number
+generation in the Kerberos system is done on the KDC system.
+
+After getting these sources, type "make world" at the toplevel of
+your source tree. This will, among other things, build the fix_kdb_keys
+program. This is not necessary if you have already got prebuilt
+binaries with this distribution.

eBones/README.libdes

@@ -1,56 +0,0 @@
-
-			libdes, Version 3.00 93/10/07
-
-		Copyright (c) 1993, Eric Young
-			  All rights reserved.
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of either:
-    
-	a) the GNU General Public License as published by the Free
-	Software Foundation; either version 1, or (at your option) any
-	later version, or
-
-	b) the "Artistic License" which comes with this Kit.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See either
-    the GNU General Public License or the Artistic License for more details.
-
-    You should have received a copy of the Artistic License with this
-    Kit, in the file named "Artistic".  If not, I'll be glad to provide one.
-
-    You should also have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
----
-This kit builds a DES encryption library and a DES encryption program.
-It suports ecb, cbc, ofb, cfb, triple ecb, triple cbc and MIT's pcbc
-encryption modes and also has a fast implementation of crypt(3).
-It contains support routines to read keys from a terminal,
-generate a random key, generate a key from an arbitary length string,
-read/write encrypted data from/to a file descriptor.
-
-The implementation was written so as to conform with the manual entry
-for the des_crypt(3) library routines from MIT's project Athena.
-
-destest should be run after compilation to test the des routines.
-rpw should be run after compilation to test the read password routines.
-The des program is a replacement for the sun des command.  I believe it
-conforms to the sun version.
-
-The Imakefile is setup for use in the kerberos distribution.
-
-These routines are best compiled with gcc or any other good
-optimising compiler.
-Just turn you optimiser up to the highest settings and run destest
-after the build to make sure everything works.
-
-I believe these routines are close to the fastest and most portable DES
-routines that use small lookup tables (4.5k) that are publicly available.
-The fcrypt routine is faster than ufc's fcrypt (when compiling with
-gcc2 -O2) on the sparc 2 (1410 vs 1270) but is not so good on other machines
-(on a sun3/260 168 vs 336).
-
-Eric Young ([email protected])

eBones/acl/Makefile

@@ -1,10 +0,0 @@
-#	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.3 1994/09/09 21:43:17 g89r4222 Exp $
-
-LIB=	acl
-SHLIB_MAJOR= 2
-SHLIB_MINOR= 0
-CFLAGS+=-DDEBUG -DKERBEROS -I${.CURDIR}/../include
-SRCS=	acl_files.c
-
-.include <bsd.lib.mk>