Tell stupid users to write the bootcode.

This commit was manufactured by cvs2svn to create branch 'RELEASE_2_0'.
Fix some wonkiness in MY code this time. Sigh..
2026-10-31 12:56:10 +01:00 · 1994-11-22 10:58:58 +00:00 · 1994-11-22 10:57:37 +00:00 · 1994-11-22 10:40:44 +00:00 · 1994-11-22 10:37:25 +00:00 · 1994-11-22 06:32:34 +00:00
7611 changed files with 345907 additions and 706303 deletions
@@ -1,10 +1,11 @@
 #
-#	Makefile,v 1.57 1995/05/29 23:50:55 rgrimes Exp
+#	$Id: Makefile,v 1.29 1994/11/08 00:55:08 ache Exp $
 #
 # Make command line options:
-#	-DCLOBBER will remove /usr/include and MOST of /usr/lib
+#	-DCLOBBER will remove /usr/include and MOST of /usr/lib 
 #	-DMAKE_LOCAL to add ./local to the SUBDIR list
 #	-DMAKE_PORTS to add ./ports to the SUBDIR list
+# XXX1	-DMAKE_KERBEROS to build KerberosIV
 #	-DMAKE_EBONES to build eBones (KerberosIV)
 #
 #	-DNOCLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -13,17 +14,18 @@
 #	-DNOOBJDIR do not run ``${MAKE} obj''
 #	-DNOPROFILE do not build profiled libraries
 #	-DNOSECURE do not go into secure subdir
+#
+#
+# XXX1	The kerberos IV off the 4.4-Lite tape (src/kerberosIV)
+#	will not build successfully yet.  MAKE_KERBEROS should not be
+#	defined.

 # Put initial settings here.
 SUBDIR=

-# We must do include and lib first so that the perl *.ph generation
-# works correctly as it uses the header files installed by this.
-.if exists(include)
-SUBDIR+= include
-.endif
-.if exists(lib)
-SUBDIR+= lib
+# Must be first for "distribute" to work
+.if exists(release)
+SUBDIR+= release
 .endif

 .if exists(bin)
@@ -38,6 +40,15 @@ SUBDIR+= games
 .if exists(gnu)
 SUBDIR+= gnu
 .endif
+.if exists(include)
+SUBDIR+= include
+.endif
+.if exists(lib)
+SUBDIR+= lib
+.endif
+.if exists(kerberosIV) && !defined(NOCRYPT) && defined(MAKE_KERBEROS)
+SUBDIR+= kerberosIV
+.endif
 .if exists(eBones) && !defined(NOCRYPT) && defined(MAKE_EBONES)
 SUBDIR+= eBones
 .endif
@@ -88,11 +99,11 @@ OBJDIR=		obj
 .endif
 .if defined(NOCLEANDIR)
 CLEANDIR=	clean
-.else
+.else 
 CLEANDIR=	cleandir
 .endif

-world:	hierarchy mk cleandist includes lib-tools libraries tools
+world:	hierarchy cleandist mk includes libraries tools
 	@echo "--------------------------------------------------------------"
 	@echo " Rebuilding ${DESTDIR} The whole thing"
 	@echo "--------------------------------------------------------------"
@@ -100,11 +111,12 @@ world:	hierarchy mk cleandist includes lib-tools libraries tools
 	${MAKE} depend all install
 	cd ${.CURDIR}/share/man &&		${MAKE} makedb

+
 hierarchy:
 	@echo "--------------------------------------------------------------"
 	@echo " Making hierarchy"
 	@echo "--------------------------------------------------------------"
-	cd ${.CURDIR}/etc &&		${MAKE} distrib-dirs
+	cd ${.CURDIR}/release &&		${MAKE} hierarchy

 update:
 .if defined(SUP_UPDATE)
@@ -157,7 +169,6 @@ installmost:
 	cd ${.CURDIR}/usr.sbin	&&	${MAKE} ${.MAKEFLAGS} install
 	cd ${.CURDIR}/gnu/libexec &&	${MAKE} ${.MAKEFLAGS} install
 	cd ${.CURDIR}/gnu/usr.bin &&	${MAKE} ${.MAKEFLAGS} install
-	cd ${.CURDIR}/gnu/usr.sbin &&	${MAKE} ${.MAKEFLAGS} install
 #.if defined(MAKE_EBONES) && !defined(NOCRYPT)
 #	cd ${.CURDIR}/eBones	&&	${MAKE} ${.MAKEFLAGS} installmost
 #.endif
@@ -176,7 +187,6 @@ most:
 	cd ${.CURDIR}/usr.sbin	&&	${MAKE} ${.MAKEFLAGS} all
 	cd ${.CURDIR}/gnu/libexec &&	${MAKE} ${.MAKEFLAGS} all
 	cd ${.CURDIR}/gnu/usr.bin &&	${MAKE} ${.MAKEFLAGS} all
-	cd ${.CURDIR}/gnu/usr.sbin &&	${MAKE} ${.MAKEFLAGS} all
 #.if defined(MAKE_EBONES) && !defined(NOCRYPT)
 #	cd ${.CURDIR}/eBones	&&	${MAKE} ${.MAKEFLAGS} most
 #.endif
@@ -196,16 +206,19 @@ includes:
 	@echo "--------------------------------------------------------------"
 	@echo
 .if defined(CLOBBER)
-	rm -rf ${DESTDIR}/usr/include/*
-	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
-		-p ${DESTDIR}/usr/include
+	rm -rf ${DESTDIR}/usr/include
+	mkdir ${DESTDIR}/usr/include
+	chown ${BINOWN}.${BINGRP} ${DESTDIR}/usr/include
+	chmod 755 ${DESTDIR}/usr/include
 .endif
 	cd ${.CURDIR}/include &&		${MAKE} install
 	cd ${.CURDIR}/gnu/include &&		${MAKE}	install
 	cd ${.CURDIR}/gnu/lib/libreadline &&	${MAKE} beforeinstall
-	cd ${.CURDIR}/gnu/lib/libregex &&	${MAKE} beforeinstall
 	cd ${.CURDIR}/gnu/lib/libg++ &&         ${MAKE} beforeinstall
 	cd ${.CURDIR}/gnu/lib/libdialog &&      ${MAKE} beforeinstall
+.if exists(kerberosIV) && !defined(NOCRYPT) && defined(MAKE_KERBEROS)
+	cd ${.CURDIR}/kerberosIV/include &&	${MAKE} install
+.endif
 .if exists(eBones) && !defined(NOCRYPT) && defined(MAKE_EBONES)
 	cd ${.CURDIR}/eBones/include &&		${MAKE} beforeinstall
 .endif
@@ -215,39 +228,11 @@ includes:
 	cd ${.CURDIR}/lib/libmd &&		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libmytinfo &&		${MAKE}	beforeinstall
 	cd ${.CURDIR}/lib/libncurses &&		${MAKE}	beforeinstall
-.if !defined(WANT_CSRG_LIBM)
+.if defined(WANT_MSUN)
 	cd ${.CURDIR}/lib/msun &&		${MAKE} beforeinstall
 .endif
-	cd ${.CURDIR}/lib/libpcap &&		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/librpcsvc &&		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libskey &&		${MAKE} beforeinstall
-	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
-
-lib-tools:
-	@echo "--------------------------------------------------------------"
-	@echo " Rebuilding tools needed to build the libraries"
-	@echo "--------------------------------------------------------------"
-	@echo
-	cd ${.CURDIR}/gnu/usr.bin/ld && \
-		${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
-	cd ${.CURDIR}/usr.bin/ar && \
-		${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
-	cd ${.CURDIR}/usr.bin/ranlib && \
-		${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
-	cd ${.CURDIR}/usr.bin/nm && \
-		${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
-	cd ${.CURDIR}/usr.bin/lex/lib && \
-		${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
-	cd ${.CURDIR}/usr.bin/compile_et && \
-		${MAKE} depend all install ${CLEANDIR} ${OBJDIR} && \
-		rm -f /usr/sbin/compile_et
-	cd ${.CURDIR}/usr.bin/mk_cmds && \
-		${MAKE} depend all install ${CLEANDIR} ${OBJDIR}

 libraries:
 	@echo "--------------------------------------------------------------"
@@ -258,24 +243,10 @@ libraries:
 	find ${DESTDIR}/usr/lib \! -name '*.s[ao].*' -a \! -type d | \
 		xargs rm -rf
 .endif
-.if exists(lib/libcompat)
-	cd ${.CURDIR}/lib/libcompat && \
-		${MAKE} depend all install
-.endif
-.if exists(lib/libncurses)
-	cd ${.CURDIR}/lib/libncurses && \
-		${MAKE} depend all install
-.endif
-.if exists(lib/libtermcap)
-	cd ${.CURDIR}/lib/libtermcap && \
-		${MAKE} depend all install
-.endif
-.if exists(gnu)
 	cd ${.CURDIR}/gnu/lib && \
 		${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
 	cd ${.CURDIR}/gnu/usr.bin/cc/libgcc && \
 		${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
-.endif
 .if exists(secure) && !defined(NOCRYPT) && !defined(NOSECURE)
 	cd ${.CURDIR}/secure/lib && \
 		${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
@@ -288,6 +259,16 @@ libraries:
 .endif
 	cd ${.CURDIR}/usr.bin/lex/lib && \
 		${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
+.if exists(kerberosIV) && !defined(NOCRYPT) && defined(MAKE_KERBEROS)
+	cd ${.CURDIR}/kerberosIV/acl && \
+		${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
+	cd ${.CURDIR}/kerberosIV/des && \
+		${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
+	cd ${.CURDIR}/kerberosIV/kdb && \
+		${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
+	cd ${.CURDIR}/kerberosIV/krb && \
+		${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
+.endif
 .if exists(eBones) && !defined(NOCRYPT) && defined(MAKE_EBONES)
 	cd ${.CURDIR}/eBones/des && \
 		${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
@@ -298,10 +279,6 @@ libraries:
 	cd ${.CURDIR}/eBones/krb && \
 		${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
 .endif
-.if exists(usr.sbin/pcvt/keycap)
-	cd ${.CURDIR}/usr.sbin/pcvt/keycap && \
-		 ${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
-.endif

 tools:
 	@echo "--------------------------------------------------------------"
@@ -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
@@ -1,9 +1,9 @@
-; TODO,v 1.12 1995/04/23 21:34:23 paul Exp
+; $Id: TODO,v 1.4 1994/09/11 20:01:03 phk Exp $

 ** To skip this preamble, search forward for the pattern `**'.

 This file contains a list of ideas that people have come up for "good
-things to do" in FreeBSD.  These aren't necessarily things on the
+things to do" in FreeBSD 2.0.  These aren't necessarily things on the
 fast-track, and in fact consist mostly of things that the core team is
 never going to find the time to do so, if most things here are going
 to happen at all, they'll happen when someone reading this list steps
@@ -13,7 +13,7 @@ That said, a lot of these ideas would be very nice to have and would
 add substantially to the perceived value of FreeBSD.  Some items on
 this list would add a LOT of value, for that matter, and are by no
 means trivial.  Take and fix an item with a (*) next to it and WC will
-even send you a free CD for your troubles!  It's the least they
+even send you a free 2.0 CD for your troubles!  It's the least they
 can do for all notable contributors.

 This is a also good place to look if you're keen for a little
@@ -40,8 +40,8 @@ If you start working on something from this list, we also suggest that
 you contact the email-address listed for more information and to
 provide some central coordination for your effort.  If the email
 address given is simply <foo> then the email address can be presumed
-to be <foo@FreeBSD.ORG>.  If no email address is listed, then
-simply send to <freebsd-hackers@FreeBSD.org>.
+to be <foo@freefall.cdrom.com>.  If no email address is listed, then
+simply send to <freebsd-hackers@freefall.cdrom.com>.

 Thanks!

@@ -49,10 +49,19 @@ Thanks!

 ** --- cut here ---

+TASKID:	940820001
+TASK:	Add interupts to pas.c
+DETAIL: { You'll need a manual for the ncr-5380 chip and possibly some
+doc on the PAS16.  Linux/NetBSD also have existing drivers to study. }
+EMAIL:	<phk>
+CATS:	kernel scsi
+GRADE:	ADVANCED
+STATUS:	OPEN
+	
 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. }
+DETAIL: { Use IF_LLC0 as mode-flag.  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
@@ -76,10 +85,19 @@ 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:	<jkh>
 CATS:	kernel laptop
 GRADE:	ADVANCED
-STATUS:	IN PROGRESS
+STATUS:	OPEN (*)
+
+TASKID:	940820005
+TASK:	Salvage seagate.c driver from 1.1.5.1
+DETAIL: { We've got a seagate driver that could use a little cleanup and
+migration effort }
+EMAIL:	<jkh>
+CATS:	kernel scsi
+GRADE:	BEGINNER
+STATUS:	OPEN

 TASKID:	940820006
 TASK:	Add bootp/DHCP to the generic ethernet code.
@@ -100,6 +118,16 @@ CATS:	kernel networking
 GRADE:	ADVANCED
 STATUS:	OPEN (*)

+TASKID:	940820009
+TASK:	Make a freebsd.com MS-DOS boot program
+DETAIL:	{ This program should be able to boot like the boot-blocks, that is
+find a FreeBSD-partition and load the kernel from there, but it should
+also be able to load the kernel from an optional MS-DOS file. }
+EMAIL:	<phk>
+CATS:	kernel DOS
+GRADE:	ADVANCED
+STATUS:	OPEN (*)
+
 TASKID:	940820010
 TASK:	Make iostat find the disks
 DETAIL:	{ This is actually mostly a change to the device-drivers to collect 
@@ -128,7 +156,7 @@ best accomplish the task. }
 EMAIL:	<jkh>
 CATS:	user
 GRADE:	INTERMEDIATE
-STATUS:	CLOSED - PENDING DOC
+STATUS:	OPEN

 TASKID: 940911001
 TASK:	Make PAS16 a controller.
@@ -138,29 +166,3 @@ EMAIL:	<phk>
 CATS:	kernel
 GRADE:	INTERMEDIATE
 STATUS:	OPEN
-
-TASKID:	950222001
-TASK:	Make find smarter about -fstype local
-DETAIL:	{ Currently when doing a find blah -fstype local the find traverses
-through all nfs mounted file systems looking for locally mounted filesystems,
-this could be short circuited by using getmntinfo/statfs.  Note that you
-can not do this when following symlinks. }
-EMAIL:	<rgrimes, phk>
-CATS:	user
-GRADE:	INTERMEDIATE
-STATUS:	OPEN
-
-TASKID: 95031701
-TASK:	Implement a file system debugger (fsdb)
-DETAIL:	{ Traditionally, there has been a fsdb(8) program in Unix.
-This program is not part of 4.4BSD, but the current system lacks
-some utility to low-level step through the file system and repair
-(or damage:) something in case fsck tells about problems, but the
-administrator is unlucky with the suggested actions of fsck.
-The original fsdb had a terrible syntax, something more rationale
-should be built instead. }
-EMAIL:	<joerg>
-CATS:	user
-GRADE:	ADVANCED
-STATUS:	OPEN
-
@@ -1,16 +0,0 @@
-This directory contains the "TODO" files for various core team members.
-This gives interested parties external to the project some idea as
-to just what exactly it is that we're doing over here!
-
-If something on one of these lists catches your eye as something you think
-you may be able to render valuable assistance with, please!  By all means
-send mail to the member owning the list (<name>@FreeBSD.org).  Chances are good
-they'll more than appreciate hearing from you.  By the the same token, however,
-please do NOT send "when will this be done?" or "yes! please!" sorts of
-messages to the core team.  If something is on one of these lists it's
-because the team member in question really WANTS to do it and must now simply
-wrestle with the demons of time, sleep and hunger in trying to get it
-done before the freeze date.  If you want to make anything on any of these
-lists go faster, offer to help! :-)  Thanks!
-
-					Jordan
@@ -1,80 +0,0 @@
-# TODO File for core-team member:		Satoshi Asami
-# Revision: asami,v 1.7 1995/05/17 14:18:33 asami Exp
-#
-# This is my publically readable TODO file, showing the things I have
-# on my TODO list for 2.0.5/2.1.  Comments (intelligent ones, anyway :)
-# always welcome!
-#
-*----------------------------------------------------------------------------*-
-
-Update: Thu Apr  6 08:47:09 PDT 1995
-Due:    Unspecified
-Prio:   High
-Task:   Get Some Sleep.
-
-Seems like this one is mandatory. :)
-
-*-
-
-Update:	Wed May 17 07:08:07 PDT 1995
-Due:	RSN
-Prio:	Extremely High
-Task:	Rebuild packages
-Status:	Done for all non-interactive ports, now waiting for people
-	build interactive ports.
-
-*-
-
-Update:	Wed May 17 07:08:07 PDT 1995
-Due:	RSN
-Prio:	Extremely High
-Task:	Test ports/packages
-Status:	Under way.  Posted an announcement to -announce list and
-	newsgroup, people are now grabbing them so hopefully we'll get
-	pestered with bug reports soon. :)
-
-*-
-
-Update: Wed May 17 07:08:07 PDT 1995
-Due:	Before 2.2
-Prio:	Medium
-Task:	Clean up bsd.port.mk
-Status:	(1) is done.
-
-There are a couple of ideas here:
-
-(1) Standardize the pre-* and post-* targets.
-
-(2) Re-think the defaults of the variables.  The "good" Makefiles are
-    so terse it's hard to find out how you're supposed to modify it
-    unless your port is extremely "standard".
-
-*-
-
-Update:	Wed May 17 07:08:07 PDT 1995
-Due:	Not specified
-Prio:	High
-Task:	A graphical front-end for port/package installation
-Status:	Jason Boerner ([email protected]) is working
-	on tkpkg now.
-
-*-
-
-Update: Thu Apr  6 08:44:01 PDT 1995
-Due:	Sometime in the future
-Prio:	Would be great if it worked
-Task:	A graphical front-end for making ports
-
-Yes, I know it's a pipe dream...but don't you think it will be great
-if you can make a port by just modifying the source, and then giving
-that and the original to a tk program, clicking the buttons the rest
-of the way?
-
-*-
-
-Update: Thu Apr  6 08:39:07 PDT 1995
-Due:	If I ever get to it
-Prio:	Would be really great
-Task:	Write a bestseller "ports for dummies"
-
-...and become rich! :)
@@ -1,93 +0,0 @@
-# TODO File for the core-team as such.
-# Revision: core-team,v 1.6 1995/05/30 06:45:57 rgrimes Exp
-#
-# This is things and issues the coreteam need to resolve.
-#
-*----------------------------------------------------------------------------*-
-
-Update: Thu Apr 20 01:09:59 PDT 1995
-Due:	Apr 22 1995
-Prio:	High
-Task:	Should the files in the src-dist be "cvs co"'ed or "cvs export"'ed.
-
-Pro cvs co:
-
-	cvs Id's and other magic stuff survives, so it people send us a
-	patch we don't risk loosing the cvs core-team,v 1.6 1995/05/30 06:45:57 rgrimes Exp info.
-
-Pro cvs export:
-
-	If people import our source to a foreign cvs/rcs tree, we will not
-	loose our core-team,v 1.6 1995/05/30 06:45:57 rgrimes Exp info.
-
-Contra cvs export:
-
-	The diff (& ctm-delta) to current is big for no good reason.
-
-*-
-
-Update: Thu Apr 20 01:09:59 PDT 1995
-Due:	Apr 22 1995
-Prio:	High
-Task:	RELEASE/RELDATE strings
-
-Should we set the RELEASE to "CURRENT-yyyymmdd" as default in current
-and fix it up in src/release/Makefile ?
-
-Should we set RELDATE to this month, or administratively at release time.
-
-Pro "this month":  We would get better granularity for -current).
-
-Pro "admin":  Thats the way Garrett meant it to be.
-
-*-
-
-Update: Wed Apr 26 03:36:18 PDT 1995
-Due:	Apr 22 1995
-Prio:	High
-Task:	The name of 2.0.foo
-State:	Closed
-
-2.0.5 ...  2.0.9 or 2.1 ?
-
-Contra 2.0.5: pcvt jumped ahead of us :-/
-
-[It has been declared by executive decision of the new release engineer (me)
- to be 2.0.5, period.  I needed to tell the artists something while everyone
- was still wranging.  It's too late.  You will call it 2.0.5 and you will
- like it. :-) -jkh]
-*-
-
-Update: Mon Apr 24 17:48:20 PDT 1995
-Due:	Apr 27 1995
-Prio:	Low
-Task:	Change to config
-
-While I can see the general idea that config will generate a
-        -D<KERNELNAME>
-I have now received several emails from people with kernels named "DEBUG"
-and thats not fun.
-
-Would the world end if config was changed to generate
-        -DKERNEL_<KERNELNAME>
-instead ?
-
-*-
-
-Update:	Mon Apr 24 22:20:29 PDT 1995
-Due:	Apr 30th 1995
-Prio:	High
-Task:	Decide on mailinglist <-> newsgroup connection
-
-1) Should we gate -hackers into a newsgroup
-	1-1-A) should we gate the newsgroup back ?
-	or
-	1-1-B) use some header to direct replies back
-
-	1-2) What newsgroup
-
-2) as above, but -questions
-
-3) as above, but -current
-
-*-
@@ -1,58 +0,0 @@
-# TODO File for core-team member:		John Dyson
-# Revision: dyson,v 1.1 1995/04/10 06:10:05 dyson Exp
-#
-# This is my publically readable TODO file, showing the things I have on
-# my TODO list.
-#
-*----------------------------------------------------------------------------*-
-
-Update: Sun Apr 9, 1995
-Due:	2.2, maybe 2.1
-Prio:	High
-Task:	Implement full VOP_GETPAGE/VOP_PUTPAGE interface
-
-The current vnode pager violates the vfs layering.  Prototype mods have
-already been implemented.  Since the VM system and VFS systems are
-central to the reliable operation of the system, and other filesystems will
-be worked on by 2.1, this change will be added to 2.1 only if it is very
-smooth to integrate.  It will probably be placed into -current immediately
-after 2.1 release, before which I will have tested the code.  The good side
-of the 2.1 or pre 2.1 implementation is that it currently has no known
-negative side-effects and is about as CPU efficient as it can get.
-
-
-Update: Sun Apr 9, 1995
-Due:	2.2
-Prio:	Medium
-Task:	Implement proper page fault handling of non-page aligned (offset 1k
-	or other) binary formats.
-
-The task says it all.  Currently, some of the non-native executable loaders
-have work-arounds for this.
-
-
-Update: Sun Apr 9, 1995
-Due:	2.2
-Prio:	Medium
-Task:	Change the object page list into a tree representation.
-
-Since we now have a properly working merged-VM buffer cache mechanism, it
-is likely that more file modifications will be done by the mmap mechanism.
-Unfortunately, some of the VM data structures inherited from MACH are not
-very efficient at handling this kind of output.  We will implement a much
-more efficient method of handling the flushing of modified pages.  This
-is a very basic and simple change, and will have the added benefit of
-improving the efficiency of ordered traversal of pages in objects in general.
-
-Update: Sun Apr 9, 1995
-Due:	2.2, maybe 2.1
-Prio:	Medium
-Task:	Allow simple paging to files, and turning off such paging
-
-We currently can page to files through the vn device.  This is a bit
-of hackery -- and there is no way to turn off paging to such a file.  If
-there is enough swap space, it should be easy to turn off paging to either
-an explicit swap file or paging to/from any physical device, and force
-the swap/page-ins.
-
-
@@ -1,65 +0,0 @@
-# TODO File for core-team member:		Gary Palmer
-# Revision: gpalmer,v 1.3 1995/04/30 14:36:43 gpalmer Exp
-#
-# This is my publically readable TODO file, showing the things I have on
-# my TODO list for 2.1.
-#
-*----------------------------------------------------------------------------*-
-
-Update: Thu Apr 27 23:58:46 PDT 1995
-Due:	April 29th
-Prio:	High
-Task:	Run a gcc -Wall on LINT and see what it says
-Status: Underway.
-
-Some of the warnings generated may well be the result of true errors.  Go
-through the output of this and see which ones are simply poor coding
-practice and which ones are actual errors.
-*-
-
-Update: Thu Apr 27 23:58:46 PDT 1995
-Due:    April 29th
-Prio:   High
-Task:	Fix mkisofs
-
-Make mkisofs be a little less pathological in its dealings with "non-optional
-optional flags" and stop asserting all over the place.
-*-
-
-Update:	Thu Apr 27 23:58:46 PDT 1995
-Due:    April 30th
-Prio:   High
-Task:   Figure out what we're going to do with srcs to `libcompat' and the GPL
-
-We need to either draft some words for the 2.0.5 CD saying that they can
-get the 2.0R CD for a nice low price (not prohibited by the GPL - it says
-only "reasonable costs") if they want the source for libcompat, or we
-need to provide it somewhere.
-*-
-
-Update:	Thu Apr 27 23:58:46 PDT 1995
-Due:	April 30th
-Prio:	High
-Task:	Write some scripts for CD-ifying the ports and packages collection
-
-I'm not sure what's involved here, but we need some release tools for
-bundling up a `portsdist'.
-*-
-
-Update:	Thu Apr 27 23:58:46 PDT 1995
-Due:	April 30th
-Prio:	High
-Task:	Come up with canonical supfiles.
-Status:	Done (?)
-
-The canonical supfiles are out of date.  Fix them.
-
-*-
-
-Update: Sun Apr 30 07:36:04 PDT 1995
-Due:	April 30th
-Prio:	High
-Task:	Go through the GNATS database closing off dead bugs
-
-There are bugs still ``open'' in the GNATS database which are no longer
-present. Correct the situation.
@@ -1,78 +0,0 @@
-# TODO File for core-team member:		Jordan Hubbard
-# Revision: jkh,v 1.6 1995/05/16 05:32:58 jkh Exp
-#
-# This is my publically readable TODO file, showing the things I have on
-# my TODO list for 2.1.  Comments (intelligent ones, anyway :) always
-# welcome!
-#
-*----------------------------------------------------------------------------*-
-
-Update: Mon May 15 22:30:05 PDT 1995
-Due:	Closed
-Prio:	High
-Task:	Forms language spec and first implementation for "ncurses graphics"
-
-Finish this up with the install-geeks after Paul gets back from Tallin
-(lucky dog).  Need to have the first few screens up and in the generally
-planned framework before any of this will really start to make sense.
-
-[Closed: This is no longer a 2.1 item]
-*-
-
-Update: Mon May 15 22:30:05 PDT 1995
-Due:    Mid-April
-Prio:   Closed
-Task:	Investigate libftp.
-
-Need to see if libftp can let me dump ncftp from the boot floppy and
-use a more directly controlled (error handling and timeouts!  yes!) ftp
-interface directly from sysinstall.  This would also allow me to fetch
-index files on the fly and digest their contents easily.  How about a
-scheme that elimiated the temp files on your HD during an ftp install at
-all?  Just fork and have the child end feed you the pieces down a pipe
-in order, that'd work!  Libftp definitely has possibilities.
-
-[Closed:  libftp doesn't support passive mode transfers and is therefore
-useless for my purposes]
-*-
-
-Update:	Mon May 15 22:30:05 PDT 1995
-Due:    late-May
-Prio:   High
-Task:   Reorganise the /etc/*ly crud.
-
-I can't stand it.  I have to do it.  I promise to at least plan it
-out in advance before doing anything this time!  Honest! :-)
-[Revised due-date:  This won't happen right away]
-*-
-
-Update:	Mon May 15 22:30:05 PDT 1995
-Due:	end-May
-Prio:	High
-Task:	Identify the default docfile browser and get it into the system.
-
-Something is going to be invoked on our docfiles as part of the
-installation (what happens when you type F1) and I'd like to make sure
-I know what it is (Lynx?  info?  Something else?).
-[Revised due-date: This isn't going to make it into 2.0.5, clearly]
-*-
-
-Update: Mon May 15 22:30:05 PDT 1995
-Due:	Mid-April
-Prio:	Finished
-Task:	Fix the broken pkg_delete command
-
-Either John's changes or my merging of those changes really hosed pkg_delete
-and the delete routines used by pkg_add as well.
-[Closed:  Problem was fixed]
-*-
-
-Update: Mon May 15 22:30:05 PDT 1995
-Due:	?
-Prio:	Med
-Task:	Update pkg_install to not rely on libftp.
-
-libftp doesn't handle passive ftp connections, making it useless
-for firewall situations.  pkg_install needs to stop relying on it
-for this reason.
-*-
@@ -1,37 +0,0 @@
-# TODO File for:		Joerg Wunsch
-# Revision: joerg,v 1.5 1995/04/30 13:10:44 joerg Exp
-#
-# This is my publically readable TODO file, showing the things I have on
-# my TODO list for 2.1.  Comments (intelligent ones, anyway :) always
-# welcome!
-#
-*----------------------------------------------------------------------------*-
-
-Update: Sat Apr  8 14:32:56 MET DST 1995
-Due:	mid april
-Prio:	high
-Task:	Silence floppy error messages
-
-The floppy error messages require a cleanup.
-*-
-
-Update: Sat Apr  8 14:32:56 MET DST 1995
-Due:	end april
-Prio:	medium
-Task:	Repair EOF handling in floppy driver
-
->> The floppy device driver returns 0 for attempted reads from and writes
->> to precisely the end of the disk.  It returns -1 and sets errno to
->> ENOSPC for reads and writes that would cross the end of the disk or are
->> strictly beyond the end.
-*-
-
-Update: Sat Apr  8 14:32:56 MET DST 1995
-Due:	ongoing work
-Prio:	medium
-Task:	keep pcvt in -current up to date
-
-Merge Hellmuth Michaelis' betas and the expected release of pcvt-3.20
-into the -current sources.
-*-
-
@@ -1,37 +0,0 @@
-# TODO File for core-team member:		Nate Williams
-# Revision: nate,v 1.2 1995/05/30 06:45:58 rgrimes Exp
-#
-# This is my publically readable TODO file, showing the things I have on
-# my TODO list for 2.1.  Comments (intelligent ones, anyway :) always
-# welcome!
-#
-*----------------------------------------------------------------------------*-
-
-Update: Thu Apr  6 22:24:38 PDT 1995
-Due:	Before 2.1
-Prio:	High
-Task:	Fix the linker to enforce command line order linking when mixing
-        static/shared libraries.
-
-The state of affairs of the linker when mixing static and shared
-libraries is non-intuitive.  A program can have completely different
-runtime behavior dependant on if it compiled shared/static, which is
-bogus IMHO.  This 'feature' crops up in many unrelated areas of FreeBSD
-and needs to be resolved correctly.  Unfortunately, it may require a
-complete re-write of some of the underlying functions in both ld and
-ld.so.
-
-*-
-
-Update: Thu Apr  6 22:24:38 PDT 1995
-Due:	Unspcified
-Prio:	Low
-Task:	Integrate the VM86() patches posted on the NetBSD mailing list
-        into FreeBSD for inclusion as an 'experimental' project
-
-John Kohl posted patches to the NetBSD mailing list to implement a
-vm86() call.  These patches do not patch cleanly into FreeBSD, and may
-not even work after they do.  I'd like to get them in so that people can
-go off and try  things with at least a basis to start from.
-
-*-
@@ -1,106 +0,0 @@
-# TODO File for core-team member:		Poul-Henning Kamp
-# Revision: phk,v 1.4 1995/05/30 06:45:59 rgrimes Exp
-#
-# This is my publically readable TODO file, showing the things I have on
-# my TODO list for 2.1.  Comments (intelligent ones, anyway :) always
-# welcome!
-#
-*----------------------------------------------------------------------------*-
-
-Update: Thu Apr  6 00:37:50 PDT 1995
-Due:	Unspecified
-Prio:	High
-Task:	Get Much Sleep.
-
-My newborn son is still not clear on the concept of a good nights sleep.
-more later.
-
-*-
-
-Update:	Thu Apr  6 22:15:29 PDT 1995
-Due:	2.1
-Prio:	High
-Task:	"make release" rule(s)
-
-Make the stuff in src/release do what the install-geeks need it to do.
-
-*-
-
-Update:	Thu Apr  6 22:16:52 PDT 1995
-Due:	2.1
-Prio:	Med
-Task:	bad144 testing
-
-Now that I finally seem to have got access to an machine with old and
-funcky disks that should be possible
-
-*-
-
-Update:	Thu Apr  6 22:18:38 PDT 1995
-Due:	2.1
-Prio:	High
-Task:	Boot from CD
-
-Make a boot from CD facility working.
-
-*-
-
-Update:	Thu Apr  6 22:22:10 PDT 1995
-Due:	2.1
-Prio:	High
-Task:	Write lowlevel code for sysinstall TNG.
-
-The boys will need some routines doing mostly what the old sysinstall did
-too, but interfacing to the new GUI.
-
-*-
-
-Update:	Thu Apr  6 22:54:45 PDT 1995
-Due:	2.1ish
-Prio:	Med
-Task:	Review, test and commit PCMCIA stuff for Andrew McRae
-
-Andrew is busy doing our PCMCIA support.  I have promised to get it into
-the tree.
-
-*-
-
-Update:	Thu Apr  6 22:56:20 PDT 1995
-Due:	2.1
-Prio:	Med
-Task:	setup "WIP" section
-
-We want a (W)ork (I)n (P)rogress section on the ftp-area and the CD.
-
-*-
-
-Update:	Thu Apr  6 22:58:27 PDT 1995
-Due:	2.1ish
-Prio:	Med
-Task:	CTM
-
-Continue to champion, architect, code and implement CTM.
-
-*-
-
-Update:	Thu Apr  6 23:00:45 PDT 1995
-Due:	2.1
-Prio:	Med
-Task:	doc
-
-Produce (better) draft documentation for these areas:
-	CTM
-	lp#
-	gzip execution
-	install (in particular disk layout).
-
-*-
-
-Update:	Thu Apr 13 13:04:34 PDT 1995
-Due:	sometime
-Prio:	Med
-Task:	multiboot
-
-Represent FreeBSD in the "multiboot" forum, and make sure we can use the
-resulting code.
-
@@ -1,46 +0,0 @@
-# TODO File for core-team member:		Soren Schmidt
-# Revision: sos,v 1.2 1995/05/30 06:45:59 rgrimes Exp
-#
-# This is my publically readable TODO file, showing the things I have on
-# my TODO list for 2.1.  Comments (intelligent ones, anyway :) always
-# welcome!
-#
-*----------------------------------------------------------------------------*-
-
-Update: Wed Apr  5 21:46:44 MET DST 1995
-Due:	Before 2.1
-Prio:	High
-Task:	ata/atapi driver.
-
-Driver for ata3/atapi devices. This is the interface for the newer IDE
-CDROM drives. Basically its thought as a replacement for wd.c, but it
-won't handle old st506/ESDI drives (use wd.c for that).
-Its currently at a state where it can probe the devices, find out their
-type (ata/atapi/disk/cdrom), and initialize them proberly. It will also
-send atapi packets. Currently it can make a disklabel, and open/close
-the tray of my Mitsumi FX400 drive, so the communication is working.
-
-*-
-
-Update: Wed Apr  5 21:46:44 MET DST 1995
-Due:	Before 2.1
-Prio:	Medium
-Task:	Linux binary support.
-
-LKM module for running Linux binaries. Main goal is to run (you guessed
-it) DOOM. Its now so far that it'l run bash both static and shared, but
-there is still a problem with signal handling/return status.
-
-*-
-
-Update: Wed Apr  5 21:46:44 MET DST 1995
-Due:	Before 2.1
-Prio:	Medium
-Task:	New socksys driver for iBCS2 support
-
-A new socksys implementation for the iBCS2 support. The current one is
-overly complex (and it doesn't work right), this should clear up the
-situation and actually get us to run WordPerfect..
-
-*-
-
@@ -1,37 +0,0 @@
-# TODO File for core-team member:	Garrett Wollman
-# Revision: wollman,v 1.3 1995/04/25 19:53:24 wollman Exp
-#
-*----------------------------------------------------------------------------*-
-
-Update:	Fri Apr 07 11:58:56 EDT 1995
-Due:	Late April
-Prio:	Medium
-Task:	Path MTU Discovery
-
-If this can be done quickly, I'll try to do it.  Otherwise it's a 2.2
-task.
-*-
-
-Update:	Fri Apr 07 12:00:18 EDT 1995
-Due:	Late April
-Prio:	Medium
-Task:	Packet scheduler hooks
-
-The MIT packet-scheduling kernel is going to have an initial public
-release sometime soon.  It is probably not reasonable to import the
-entire distribution into FreeBSD at this time (although this is a
-medium-term goal of mine).  However, it may be possible to incorporate
-the hooks which the scheduler has into the rest of the kernel, thus
-making it easier for people who get the MIT code to add it into their
-systems.  I intend to look into this.
-*-
-
-Update:	Fri Apr 07 12:04:45 EDT 1995
-Due:	Now
-Prio:	High
-Task:	Add sysctl hooks to sysconfig, rc.
-
-There needs to be a generic mechanism in sysconfig to say `run these
-sysctl -nw commands during boot-up'.
-*-
-
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 5/31/93
-#	Makefile,v 1.2 1994/09/18 21:25:26 wollman Exp
+#	$Id$

 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 \
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	Makefile,v 1.2 1994/09/24 02:53:25 davidg Exp
+#	$Id$

 PROG=	cat

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)cat.1	8.1 (Berkeley) 6/29/93
-.\"	cat.1,v 1.2 1994/09/24 02:53:25 davidg Exp
+.\"	$Id$
 .\"
 .Dd June 29, 1993
 .Dt CAT 1
@@ -33,7 +33,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	cat.c,v 1.2 1994/09/24 02:53:26 davidg Exp
+ *	$Id$
 */

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

 PROG=	chmod

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)chmod.1	8.4 (Berkeley) 3/31/94
-.\"	chmod.1,v 1.2 1994/09/24 02:53:37 davidg Exp
+.\"	$Id$
 .\"
 .Dd March 31, 1994
 .Dt CHMOD 1
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	chmod.c,v 1.4 1995/03/19 13:27:43 joerg Exp
+ *	$Id$
 */

 #ifndef lint
@@ -49,7 +49,6 @@ static char sccsid[] = "@(#)chmod.c	8.8 (Berkeley) 4/1/94";
 #include <err.h>
 #include <errno.h>
 #include <fts.h>
-#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -70,8 +69,6 @@ main(argc, argv)
 	int Hflag, Lflag, Pflag, Rflag, ch, fflag, fts_options, hflag, rval;
 	char *ep, *mode;

-	set = NULL;
-	omode = 0;
 	Hflag = Lflag = Pflag = Rflag = fflag = hflag = 0;
 	while ((ch = getopt(argc, argv, "HLPRXfgorstuwx")) != EOF)
 		switch (ch) {
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	Makefile,v 1.2 1994/09/24 02:53:39 davidg Exp
+#	$Id$

 PROG=	cp
 SRCS=	cp.c utils.c
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)cp.1	8.3 (Berkeley) 4/18/94
-.\"	cp.1,v 1.2 1994/09/24 02:53:40 davidg Exp
+.\"	$Id$
 .\"
 .Dd April 18, 1994
 .Dt CP 1
@@ -33,7 +33,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	cp.c,v 1.6 1995/05/30 00:06:21 rgrimes Exp
+ *	$Id$
 */

 #ifndef lint
@@ -48,11 +48,11 @@ static char sccsid[] = "@(#)cp.c	8.2 (Berkeley) 4/1/94";

 /*
 * Cp copies source files to target files.
- *
+ * 
 * The global PATH_T structure "to" always contains the path to the
 * current target file.  Since fts(3) does not change directories,
 * this path can be either absolute or dot-realative.
- *
+ * 
 * The basic algorithm is to initialize "to" and use fts(3) to traverse
 * the file hierarchy rooted in the argument list.  A trivial case is the
 * case of 'cp file1 file2'.  The more interesting case is the case of
@@ -79,7 +79,7 @@ static char sccsid[] = "@(#)cp.c	8.2 (Berkeley) 4/1/94";
 #include "extern.h"

 #define	STRIP_TRAILING_SLASH(p) {					\
-        while ((p).p_end > (p).p_path + 1 && (p).p_end[-1] == '/')	\
+        while ((p).p_end > (p).p_path && (p).p_end[-1] == '/')		\
                *--(p).p_end = 0;					\
 }

@@ -105,7 +105,7 @@ main(argc, argv)
 	char *target;

 	Hflag = Lflag = Pflag = Rflag = 0;
-	while ((ch = getopt(argc, argv, "HLPRfipr")) != EOF)
+	while ((ch = getopt(argc, argv, "HLPRfipr")) != EOF) 
 		switch (ch) {
 		case 'H':
 			Hflag = 1;
@@ -188,8 +188,8 @@ main(argc, argv)
 	to.target_end = to.p_end;

 	/* Set end of argument list for fts(3). */
-	argv[argc] = NULL;
-
+	argv[argc] = NULL;     
+	
 	/*
 	 * Cp has two distinct cases:
 	 *
@@ -210,7 +210,7 @@ main(argc, argv)
 	if (r == -1 || !S_ISDIR(to_stat.st_mode)) {
 		/*
 		 * Case (1).  Target is not a directory.
-		 */
+		 */ 
 		if (argc > 1) {
 			usage();
 			exit(1);
@@ -227,7 +227,7 @@ main(argc, argv)
 				stat(*argv, &tmp_stat);
 			else
 				lstat(*argv, &tmp_stat);
-
+			
 			if (S_ISDIR(tmp_stat.st_mode) && (Rflag || rflag))
 				type = DIR_TO_DNE;
 			else
@@ -253,7 +253,7 @@ copy(argv, type, fts_options)
 	FTS *ftsp;
 	FTSENT *curr;
 	int base, dne, nlen, rval;
-	char *p, *target_mid;
+	char *p;

 	if ((ftsp = fts_open(argv, fts_options, mastercmp)) == NULL)
 		err(1, NULL);
@@ -274,10 +274,18 @@ copy(argv, type, fts_options)
 		}

 		/*
-		 * If we are in case (2) or (3) above, we need to append the
-                 * source name to the target name.
+		 * If we are in case (2) or (3) above, we need to append the 
+                 * source name to the target name.  
                 */
 		if (type != FILE_TO_FILE) {
+			if ((curr->fts_namelen +
+			    to.target_end - to.p_path + 1) > MAXPATHLEN) {
+				warnx("%s/%s: name too long (not copied)", 
+				    to.p_path, curr->fts_name);
+				rval = 1;
+				continue;
+			}
+
 			/*
 			 * Need to remember the roots of traversals to create
 			 * correct pathnames.  If there's a directory being
@@ -300,29 +308,24 @@ copy(argv, type, fts_options)
 			if (curr->fts_level == FTS_ROOTLEVEL)
 				if (type != DIR_TO_DNE) {
 					p = strrchr(curr->fts_path, '/');
-					base = (p == NULL) ? 0 :
+					base = (p == NULL) ? 0 : 
 					    (int)(p - curr->fts_path + 1);

-					if (!strcmp(&curr->fts_path[base],
+					if (!strcmp(&curr->fts_path[base], 
 					    ".."))
 						base += 1;
 				} else
 					base = curr->fts_pathlen;

+			if (to.target_end[-1] != '/') {
+				*to.target_end = '/';
+				*(to.target_end + 1) = 0;
+			}
 			p = &curr->fts_path[base];
 			nlen = curr->fts_pathlen - base;
-			target_mid = to.target_end;
-			if (*p != '/' && target_mid[-1] != '/')
-				*target_mid++ = '/';
-			*target_mid = 0;
-			if (target_mid - to.p_path + nlen > MAXPATHLEN) {
-				warnx("%s%s: name too long (not copied)",
-				    to.p_path, p);
-				rval = 1;
-				continue;
-			}
-			(void)strncat(target_mid, p, nlen);
-			to.p_end = target_mid + nlen;
+
+			(void)strncat(to.target_end + 1, p, nlen);
+			to.p_end = to.target_end + nlen + 1;
 			*to.p_end = 0;
 			STRIP_TRAILING_SLASH(to);
 		}
@@ -365,23 +368,23 @@ copy(argv, type, fts_options)
 			 * umask blocks owner writes, we fail..
 			 */
 			if (dne) {
-				if (mkdir(to.p_path,
+				if (mkdir(to.p_path, 
 				    curr->fts_statp->st_mode | S_IRWXU) < 0)
 					err(1, "%s", to.p_path);
 			} else if (!S_ISDIR(to_stat.st_mode)) {
 				errno = ENOTDIR;
-				err(1, "%s", to.p_path);
+				err(1, "%s: %s", to.p_path);
 			}
 			/*
 			 * If not -p and directory didn't exist, set it to be
-			 * the same as the from directory, umodified by the
-                         * umask; arguably wrong, but it's been that way
+			 * the same as the from directory, umodified by the 
+                         * umask; arguably wrong, but it's been that way 
                         * forever.
 			 */
 			if (pflag && setfile(curr->fts_statp, 0))
 				rval = 1;
 			else if (dne)
-				(void)chmod(to.p_path,
+				(void)chmod(to.p_path, 
 				    curr->fts_statp->st_mode);
 			break;
 		case S_IFBLK:
@@ -389,19 +392,17 @@ copy(argv, type, fts_options)
 			if (Rflag) {
 				if (copy_special(curr->fts_statp, !dne))
 					rval = 1;
-			} else {
+			} else
 				if (copy_file(curr, dne))
 					rval = 1;
-			}
 			break;
 		case S_IFIFO:
-			if (Rflag) {
+			if (Rflag)
 				if (copy_fifo(curr->fts_statp, !dne))
 					rval = 1;
-			} else {
+			else 
 				if (copy_file(curr, dne))
 					rval = 1;
-			}
 			break;
 		default:
 			if (copy_file(curr, dne))
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 *
 *	@(#)extern.h	8.2 (Berkeley) 4/1/94
- *	extern.h,v 1.2 1994/09/24 02:53:41 davidg Exp
+ *	$Id$
 */

 typedef struct {
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	utils.c,v 1.3 1995/05/30 00:06:22 rgrimes Exp
+ *	$Id$
 */

 #ifndef lint
@@ -64,7 +64,7 @@ copy_file(entp, dne)
 #ifdef VM_AND_BUFFER_CACHE_SYNCHRONIZED
 	char *p;
 #endif
-
+	
 	if ((from_fd = open(entp->fts_path, O_RDONLY, 0)) == -1) {
 		warn("%s", entp->fts_path);
 		return (1);
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	Makefile,v 1.5 1994/09/24 02:53:44 davidg Exp
+#	$Id$
 #
 # C Shell with process control; VM/UNIX VAX Makefile
 # Bill Joy UC Berkeley; Jim Kulp IIASA, Austria
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 8/14/93
-#	Makefile,v 1.2 1994/09/24 02:54:22 davidg Exp
+#	$Id$

 DIR=	usd/04.csh
 SRCS=	tabs csh.1 csh.2 csh.3 csh.4 csh.a csh.g
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.1	8.1 (Berkeley) 6/8/93
-.\"	csh.1,v 1.2 1994/09/24 02:54:23 davidg Exp
+.\"	$Id$
 .\"
 .EH 'USD:4-%''An Introduction to the C shell'
 .OH 'An Introduction to the C shell''USD:4-%'
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.2	8.1 (Berkeley) 6/8/93
-.\"	csh.2,v 1.2 1994/09/24 02:54:24 davidg Exp
+.\"	$Id$
 .\"
 .nr H1 1
 .NH
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.3	8.1 (Berkeley) 6/8/93
-.\"	csh.3,v 1.2 1994/09/24 02:54:26 davidg Exp
+.\"	$Id$
 .\"
 .nr H1 2
 .NH
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.4	8.1 (Berkeley) 6/8/93
-.\"	csh.4,v 1.2 1994/09/24 02:54:27 davidg Exp
+.\"	$Id$
 .\"
 .nr H1 3
 .NH
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.a	8.1 (Berkeley) 6/8/93
-.\"	csh.a,v 1.2 1994/09/24 02:54:28 davidg Exp
+.\"	$Id$
 .\"
 .SH
 Appendix \- Special characters
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.g	8.1 (Berkeley) 6/8/93
-.\"	csh.g,v 1.2 1994/09/24 02:54:31 davidg Exp
+.\"	$Id$
 .\"
 .SH
 Glossary
@@ -30,6 +30,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tabs	8.1 (Berkeley) 6/8/93
-.\"	tabs,v 1.2 1994/09/24 02:54:32 davidg Exp
+.\"	$Id$
 .\"
 .ta 5n 10n 15n 20n 25n 30n 35n 40n 45n 50n 55n 60n 65n 70n 75n 80n
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	alloc.c,v 1.4 1995/05/30 00:06:28 rgrimes Exp
+ *	$Id$
 */

 #ifndef lint
@@ -122,6 +122,5 @@ showall(v, t)
 {
    memtop = (char *) sbrk(0);
    (void) fprintf(cshout, "Allocated memory from 0x%lx to 0x%lx (%ld).\n",
-	    (unsigned long) membot, (unsigned long) memtop,
-                (unsigned long) (memtop - membot));
+	    (unsigned long) membot, (unsigned long) memtop, memtop - membot);
 }
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	char.c,v 1.2 1994/09/24 02:53:46 davidg Exp
+ *	$Id$
 */

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

 #include <ctype.h>
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	const.c,v 1.3 1995/05/30 00:06:29 rgrimes Exp
+ *	$Id$
 */

 #ifndef lint
@@ -72,7 +72,7 @@ Char STRcent2[] 	= { '%', '%', '\0' };
 Char STRcenthash[] 	= { '%', '#', '\0' };
 Char STRcentplus[] 	= { '%', '+', '\0' };
 Char STRcentminus[] 	= { '%', '-', '\0' };
-Char STRchase_symlinks[] = { 'c', 'h', 'a', 's', 'e', '_', 's', 'y', 'm', 'l',
+Char STRchase_symlinks[] = { 'c', 'h', 'a', 's', 'e', '_', 's', 'y', 'm', 'l', 
 			    'i', 'n', 'k', 's', '\0' };
 Char STRchild[]		= { 'c', 'h', 'i', 'l', 'd', '\0' };
 Char STRcolon[]		= { ':', '\0' };
@@ -90,7 +90,7 @@ Char STRfignore[]	= { 'f', 'i', 'g', 'n', 'o', 'r', 'e', '\0' };
 Char STRfilec[] = { 'f', 'i', 'l', 'e', 'c', '\0' };
 #endif /* FILEC */
 Char STRhistchars[]	= { 'h', 'i', 's', 't', 'c', 'h', 'a', 'r', 's', '\0' };
-Char STRtildothist[]    = { '~', '/', '.', 'h', 'i', 's', 't', 'o', 'r',
+Char STRtildothist[]    = { '~', '/', '.', 'h', 'i', 's', 't', 'o', 'r', 
 		            'y', '\0' };
 Char STRhistfile[]	= { 'h', 'i', 's', 't', 'f', 'i', 'l', 'e', '\0' };
 Char STRhistory[] 	= { 'h', 'i', 's', 't', 'o', 'r', 'y', '\0' };
@@ -109,7 +109,7 @@ Char STRml[]		= { '-', 'l', '\0' };
 Char STRmn[]		= { '-', 'n', '\0' };
 Char STRmquestion[]     = { '?' | QUOTE, ' ', '\0' };
 Char STRnice[]		= { 'n', 'i', 'c', 'e', '\0' };
-Char STRnoambiguous[]	= { 'n', 'o', 'a', 'm', 'b', 'i', 'g', 'u', 'o', 'u',
+Char STRnoambiguous[]	= { 'n', 'o', 'a', 'm', 'b', 'i', 'g', 'u', 'o', 'u', 
 			    's', '\0' };
 Char STRnobeep[]	= { 'n', 'o', 'b', 'e', 'e', 'p', '\0' };
 Char STRnoclobber[]	= { 'n', 'o', 'c', 'l', 'o', 'b', 'b', 'e', 'r', '\0' };
@@ -121,7 +121,7 @@ Char STRnotify[]	= { 'n', 'o', 't', 'i', 'f', 'y', '\0' };
 Char STRor[]		= { '|', '\0' };
 Char STRor2[]		= { '|', '|', '\0' };
 Char STRpath[]          = { 'p', 'a', 't', 'h', '\0' };
-Char STRprintexitvalue[] = { 'p', 'r', 'i', 'n', 't', 'e', 'x', 'i', 't', 'v',
+Char STRprintexitvalue[] = { 'p', 'r', 'i', 'n', 't', 'e', 'x', 'i', 't', 'v', 
 			    'a', 'l', 'u', 'e', '\0' };
 Char STRprompt[]        = { 'p', 'r', 'o', 'm', 'p', 't', '\0' };
 Char STRprompt2[]       = { 'p', 'r', 'o', 'm', 'p', 't', '2', '\0' };
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)csh.1	8.2 (Berkeley) 1/21/94
-.\"	csh.1,v 1.3 1995/05/06 13:52:29 ache Exp
+.\"	$Id$
 .\"
 .Dd January 21, 1994
 .Dt CSH 1
@@ -40,7 +40,7 @@
 .Nd a shell (command interpreter) with C-like syntax
 .Sh SYNOPSIS
 .Nm csh
-.Op Fl bcefimnstvVxX
+.Op Fl bcefinstvVxX
 .Op arg ...
 .Nm csh
 .Op Fl l
@@ -96,14 +96,6 @@ and outputs are terminals.
 The shell is a login shell (only applicable if
 .Fl l
 is the only flag specified).
-.It Fl m
-The shell loads
-.Pa .cshrc
-even if it does not belong to the effective user.
-.Xr su 1
-can pass
-.Fl m
-to the shell.
 .It Fl n
 Commands are parsed, but not executed.
 This aids in syntactic checking of shell scripts.
@@ -2115,7 +2107,6 @@ To detect looping, the shell restricts the number of
 substitutions on a single line to 20.
 .Sh SEE ALSO
 .Xr sh 1 ,
-.Xr su 1 ,
 .Xr access 2 ,
 .Xr execve 2 ,
 .Xr fork 2 ,
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	csh.c,v 1.3 1995/05/30 00:06:30 rgrimes Exp
+ *	$Id$
 */

 #ifndef lint
@@ -618,7 +618,7 @@ importpath(cp)
 	for (;;) {
 	    if ((c = *dp) == ':' || c == 0) {
 		*dp = 0;
-		if ((*cp != '/' || *cp == '\0') && (euid == 0 || uid == 0))
+		if ((*cp != '/' || *cp == '\0') && (euid == 0 || uid == 0)) 
 		    (void) fprintf(csherr,
 	    "Warning: imported path contains relative components\n");
 		pv[i++] = Strsave(*cp ? cp : STRdot);
@@ -809,7 +809,7 @@ rechist()
  	    (void) Strcat(buf, STRsldthist);
  	}

-  	if ((fp = creat(short2str(hfile), 0600)) == -1)
+  	if ((fp = creat(short2str(hfile), 0600)) == -1) 
  	    return;

 	oldidfds = didfds;
@@ -873,14 +873,14 @@ int sig;

    /*
     * We kill the last foreground process group. It then becomes
-     * responsible to propagate the SIGHUP to its progeny.
+     * responsible to propagate the SIGHUP to its progeny. 
     */
    {
 	struct process *pp, *np;

 	for (pp = proclist.p_next; pp; pp = pp->p_next) {
 	    np = pp;
-	    /*
+	    /* 
 	     * Find if this job is in the foreground. It could be that
 	     * the process leader has exited and the foreground flag
 	     * is cleared for it.
@@ -888,7 +888,7 @@ int sig;
 	    do
 		/*
 		 * If a process is in the foreground; we try to kill
-		 * it's process group. If we succeed, then the
+		 * it's process group. If we succeed, then the 
 		 * whole job is gone. Otherwise we keep going...
 		 * But avoid sending HUP to the shell again.
 		 */
@@ -1267,9 +1267,9 @@ vis_fputc(ch, fp)
 {
    char uenc[5];	/* 4 + NULL */

-    if (ch & QUOTE)
+    if (ch & QUOTE) 
 	return fputc(ch & TRIM, fp);
-    /*
+    /* 
     * XXX: When we are in AsciiOnly we want all characters >= 0200 to
     * be encoded, but currently there is no way in vis to do that.
     */
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 *
 *	@(#)csh.h	8.1 (Berkeley) 5/31/93
- *	csh.h,v 1.2 1994/09/24 02:53:52 davidg Exp
+ *	$Id$
 */

 /*
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	dir.c,v 1.3 1995/05/30 00:06:30 rgrimes Exp
+ *	$Id$
 */

 #ifndef lint
@@ -221,7 +221,7 @@ printdirs()
 	}
 	if (!(dirflag & DIR_LONG) && hp != NULL && !eq(hp, STRslash) &&
 	    (len = Strlen(hp), Strncmp(hp, dp->di_name, len) == 0) &&
-	    (dp->di_name[len] == '\0' || dp->di_name[len] == '/'))
+	    (dp->di_name[len] == '\0' || dp->di_name[len] == '/')) 
 	    len = Strlen(s = (dp->di_name + len)) + 2;
 	else
 	    len = Strlen(s = dp->di_name) + 1;
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 *
 *	@(#)dir.h	8.1 (Berkeley) 5/31/93
- *	dir.h,v 1.2 1994/09/24 02:53:55 davidg Exp
+ *	$Id$
 */

 /*
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	dol.c,v 1.3 1995/05/30 00:06:31 rgrimes Exp
+ *	$Id$
 */

 #ifndef lint
@@ -425,7 +425,7 @@ Dgetdol()
 	if (dimen || bitset)
 	    stderror(ERR_SYNTAX);
 	if (backpid != 0) {
-	    if (dolbang)
+	    if (dolbang) 
 		xfree((ptr_t) dolbang);
 	    setDolp(dolbang = putn(backpid));
 	}
@@ -645,13 +645,13 @@ fixDolMod()
 		    dolwcnt = 10000;
 		c = DgetC(0);
 	    }
-	    if ((c == 'g' && dolmcnt != 10000) ||
+	    if ((c == 'g' && dolmcnt != 10000) || 
 		(c == 'a' && dolwcnt != 10000)) {
 		if (c == 'g')
 		    dolmcnt = 10000;
 		else
 		    dolwcnt = 10000;
-		c = DgetC(0);
+		c = DgetC(0); 
 	    }

 	    if (c == 's') {	/* [eichin:19910926.0755EST] */
@@ -659,12 +659,12 @@ fixDolMod()
 		int delim = DgetC(0);
 		dolmod[dolnmod++] = c;
 		dolmod[dolnmod++] = delim;
-
+		
 		if (!delim || letter(delim)
 		    || Isdigit(delim) || any(" \t\n", delim)) {
 		    seterror(ERR_BADSUBST);
 		    break;
-		}
+		}	
 		while ((c = DgetC(0)) != (-1)) {
 		    dolmod[dolnmod++] = c;
 		    if(c == delim) delimcnt--;
@@ -708,7 +708,7 @@ setDolp(cp)
 	    Char *lhsub, *rhsub, *np;
 	    size_t lhlen = 0, rhlen = 0;
 	    int didmod = 0;
-
+		
 	    delim = dolmod[++i];
 	    if (!delim || letter(delim)
 		|| Isdigit(delim) || any(" \t\n", delim)) {
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	err.c,v 1.2 1994/09/24 02:53:57 davidg Exp
+ *	$Id$
 */

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

 #ifndef lint
@@ -50,7 +50,7 @@ static char sccsid[] = "@(#)exec.c	8.1 (Berkeley) 5/31/93";
 # include <stdarg.h>
 #else
 # include <varargs.h>
-#endif
+#endif 

 #include "csh.h"
 #include "extern.h"
@@ -696,7 +696,7 @@ tellmewhat(lex)
 	if (eq(sp->word, str2short(bptr->bname))) {
 	    if (aliased)
 		prlex(cshout, lex);
-	    (void) fprintf(cshout, "%s: shell built-in command.\n",
+	    (void) fprintf(cshout, "%s: shell built-in command.\n", 
 			   vis_str(sp->word));
 	    sp->word = s0;	/* we save and then restore this */
 	    return;
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	exp.c,v 1.2 1994/09/24 02:54:00 davidg Exp
+ *	$Id$
 */

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

 #include <sys/cdefs.h>
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	file.c,v 1.3 1995/05/30 00:06:33 rgrimes Exp
+ *	$Id$
 */

 #ifndef lint
@@ -521,7 +521,7 @@ again:				/* search for matches */
 	return (numitems);
    }
    else {			/* LIST */
-	qsort((ptr_t) items, numitems, sizeof(items[0]),
+	qsort((ptr_t) items, numitems, sizeof(items[0]), 
 		(int (*) __P((const void *, const void *))) sortscmp);
 	print_by_column(looking_for_lognames ? NULL : tilded_dir,
 			items, numitems);
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	func.c,v 1.3 1995/05/30 00:06:34 rgrimes Exp
+ *	$Id$
 */

 #ifndef lint
@@ -860,12 +860,12 @@ wfree()
 	if (wp->w_end.type != I_SEEK && wp->w_start.type == wp->w_end.type &&
 	    wp->w_start.type == o.type) {
 	    if (wp->w_end.type == F_SEEK) {
-		if (o.f_seek >= wp->w_start.f_seek &&
+		if (o.f_seek >= wp->w_start.f_seek && 
 		    (wp->w_end.f_seek == 0 || o.f_seek < wp->w_end.f_seek))
 		    break;
 	    }
 	    else {
-		if (o.a_seek >= wp->w_start.a_seek &&
+		if (o.a_seek >= wp->w_start.a_seek && 
 		    (wp->w_end.a_seek == 0 || o.a_seek < wp->w_end.a_seek))
 		    break;
 	    }
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	glob.c,v 1.3 1995/05/30 00:06:35 rgrimes Exp
+ *	$Id$
 */

 #ifndef lint
@@ -574,7 +574,7 @@ tglob(t)
 	     */
 	    if (c == '`') {
 		gflag |= G_CSH;
-		while (*p && *p != '`')
+		while (*p && *p != '`') 
 		    if (*p++ == '\\') {
 			if (*p)		/* Quoted chars */
 			    p++;
@@ -806,7 +806,7 @@ pword()
    pnleft = MAXPATHLEN - 4;
 }

-int
+int 
 Gmatch(string, pattern)
    Char *string, *pattern;
 {
@@ -829,7 +829,7 @@ Gmatch(string, pattern)

    blkfree(blk);
    return(gres == gpol);
-}
+} 

 static int
 pmatch(string, pattern)
@@ -870,7 +870,7 @@ pmatch(string, pattern)
 			      (*(pattern-2) & TRIM) <= stringc);
 		    pattern++;
 		}
-		else
+		else 
 		    match = (stringc == (rangec & TRIM));
 	    }
 	    if (rangec == 0)
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	hist.c,v 1.2 1994/09/24 02:54:06 davidg Exp
+ *	$Id$
 */

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

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

 #ifndef lint
@@ -575,12 +575,12 @@ getdol()
 		int delimcnt = 2;
 		int delim = getC(0);
 		*np++ = delim;
-
+		
 		if (!delim || letter(delim)
 		    || Isdigit(delim) || any(" \t\n", delim)) {
 		    seterror(ERR_BADSUBST);
 		    break;
-		}
+		}	
 		while ((c = getC(0)) != (-1)) {
 		    *np++ = c;
 		    if(c == delim) delimcnt--;
@@ -877,7 +877,7 @@ dosub(sc, en, global)

    wdp = hp;
    while (--i >= 0) {
-	register struct wordent *new =
+	register struct wordent *new = 
 		(struct wordent *) xcalloc(1, sizeof *wdp);

 	new->word = 0;
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	misc.c,v 1.2 1994/09/24 02:54:10 davidg Exp
+ *	$Id$
 */

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

 #ifndef lint
@@ -52,19 +52,19 @@ static char sccsid[] = "@(#)parse.c	8.1 (Berkeley) 5/31/93";
 static void	 asyntax __P((struct wordent *, struct wordent *));
 static void	 asyn0 __P((struct wordent *, struct wordent *));
 static void	 asyn3 __P((struct wordent *, struct wordent *));
-static struct wordent
+static struct wordent 
 		*freenod __P((struct wordent *, struct wordent *));
-static struct command
+static struct command 
 		*syn0 __P((struct wordent *, struct wordent *, int));
-static struct command
+static struct command 
 		*syn1 __P((struct wordent *, struct wordent *, int));
-static struct command
+static struct command 
 		*syn1a __P((struct wordent *, struct wordent *, int));
-static struct command
+static struct command 
 		*syn1b __P((struct wordent *, struct wordent *, int));
-static struct command
+static struct command 
 		*syn2 __P((struct wordent *, struct wordent *, int));
-static struct command
+static struct command 
 		*syn3 __P((struct wordent *, struct wordent *, int));

 #define ALEFT	21		/* max of 20 alias expansions	 */
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 *
 *	@(#)pathnames.h	8.1 (Berkeley) 5/31/93
- *	pathnames.h,v 1.2 1994/09/24 02:54:12 davidg Exp
+ *	$Id$
 */

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

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

 /*
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	sem.c,v 1.3 1995/05/30 00:06:37 rgrimes Exp
+ *	$Id$
 */

 #ifndef lint
@@ -438,7 +438,7 @@ execute(t, wanttty, pipein, pipeout)
    }
    /*
     * Fall through for all breaks from switch
-     *
+     * 
     * If there will be no more executions of this command, flush all file
     * descriptors. Places that turn on the F_REPEAT bit are responsible for
     * doing donefds after the last re-execution
@@ -476,7 +476,7 @@ int i;
 *
 * I don't know what is best to do. I think that Ambiguous is better
 * than restructuring the command vector, because the user can get
- * unexpected results. In any case, the command vector restructuring
+ * unexpected results. In any case, the command vector restructuring 
 * code is present and the user can choose it by setting noambiguous
 */
 static Char *
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	set.c,v 1.3 1995/05/30 00:06:38 rgrimes Exp
+ *	$Id$
 */

 #ifndef lint
@@ -664,7 +664,7 @@ exportpath(val)
 			       "Warning: ridiculously long PATH truncated\n");
 		break;
 	    }
-	    if ((**val != '/' || **val == '\0') && (euid == 0 || uid == 0))
+	    if ((**val != '/' || **val == '\0') && (euid == 0 || uid == 0)) 
 		    (void) fprintf(csherr,
 		    "Warning: exported path contains relative components.\n");
 	    (void) Strcat(exppath, *val++);
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	str.c,v 1.3 1995/05/30 00:06:39 rgrimes Exp
+ *	$Id$
 */

 #ifndef lint
@@ -449,21 +449,21 @@ vis_str(cp)

    if (cp == NULL)
 	return (NULL);
-
+    
    for (dp = cp; *dp++;)
 	continue;
    n = ((dp - cp) << 2) + 1; /* 4 times + NULL */
    if (dstsize < n) {
-	sdst = (char *) (dstsize ?
+	sdst = (char *) (dstsize ? 
 			    xrealloc(sdst, (size_t) n * sizeof(char)) :
 			    xmalloc((size_t) n * sizeof(char)));
 	dstsize = n;
    }
-    /*
+    /* 
     * XXX: When we are in AsciiOnly we want all characters >= 0200 to
     * be encoded, but currently there is no way in vis to do that.
     */
    (void) strvis(sdst, short2str(cp), VIS_NOSLASH);
    return (sdst);
 }
-
+    
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	time.c,v 1.5 1995/05/30 00:06:40 rgrimes Exp
+ *	$Id$
 */

 #ifndef lint
@@ -180,7 +180,7 @@ prusage(r0, r1, e, b)
 		break;

 	    case 'X':		/* (average) shared text size */
-		(void) fprintf(cshout, "%ld", t == 0 ? 0L :
+		(void) fprintf(cshout, "%ld", t == 0 ? 0L : 
 			       (r1->ru_ixrss - r0->ru_ixrss) / t);
 		break;

@@ -246,7 +246,7 @@ pdeltat(t1, t0)
    struct timeval td;

    tvsub(&td, t1, t0);
-    (void) fprintf(cshout, "%ld.%01ld", td.tv_sec, td.tv_usec / 100000L);
+    (void) fprintf(cshout, "%d.%01d", td.tv_sec, td.tv_usec / 100000);
 }

 void
@@ -256,7 +256,7 @@ tvadd(tsum, t0)

    tsum->tv_sec += t0->tv_sec;
    tsum->tv_usec += t0->tv_usec;
-    if (tsum->tv_usec >= 1000000)
+    if (tsum->tv_usec > 1000000)
 	tsum->tv_sec++, tsum->tv_usec -= 1000000;
 }

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

 PROG=	date
 SRCS=	date.c netdate.c
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)date.1	8.2 (Berkeley) 11/17/93
-.\"	date.1,v 1.5 1995/04/03 20:08:32 joerg Exp
+.\"	$Id$
 .\"
 .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''.
+``%a %b %e %H:%M:%S %Z %Y%n''.
 .Ed
 .Pp
 If an operand does not have a leading plus sign, it is interpreted as
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	date.c,v 1.4 1995/04/03 20:08:33 joerg Exp
+ *	$Id$
 */

 #ifndef lint
@@ -76,19 +76,13 @@ main(argc, argv)
 	struct timezone tz;
 	int ch, rflag;
 	char *format, buf[1024];
-	char *endptr;
-	int set_timezone;

 	tz.tz_dsttime = tz.tz_minuteswest = 0;
 	rflag = 0;
-	set_timezone = 0;
 	while ((ch = getopt(argc, argv, "d:nr:ut:")) != EOF)
 		switch((char)ch) {
 		case 'd':		/* daylight savings time */
-			tz.tz_dsttime = strtol(optarg, &endptr, 10) ? 1 : 0;
-			if (endptr == optarg || *endptr != '\0')
-				usage();
-			set_timezone = 1;
+			tz.tz_dsttime = atoi(optarg) ? 1 : 0;
 			break;
 		case 'n':		/* don't set network */
 			nflag = 1;
@@ -102,11 +96,11 @@ main(argc, argv)
 			break;
 		case 't':		/* minutes west of GMT */
 					/* error check; don't allow "PST" */
-			tz.tz_minuteswest = strtol(optarg, &endptr, 10);
-			if (endptr == optarg || *endptr != '\0')
-				usage();
-			set_timezone = 1;
-			break;
+			if (isdigit(*optarg)) {
+				tz.tz_minuteswest = atoi(optarg);
+				break;
+			}
+			/* FALLTHROUGH */
 		default:
 			usage();
 		}
@@ -117,13 +111,14 @@ main(argc, argv)
 	 * If -d or -t, set the timezone or daylight savings time; this
 	 * doesn't belong here, there kernel should not know about either.
 	 */
-	if (set_timezone && settimeofday((struct timeval *)NULL, &tz))
-		err(1, "settimeofday (timezone)");
+	if ((tz.tz_minuteswest || tz.tz_dsttime) &&
+	    settimeofday(NULL, &tz))
+		err(1, "settimeofday");

 	if (!rflag && time(&tval) == -1)
 		err(1, "time");

-	format = "%a %b %e %H:%M:%S %Z %Y";
+	format = "%a %b %e %H:%M:%S %Z %Y\n";

 	/* allow the operands in any order */
 	if (*argv && **argv == '+') {
@@ -140,7 +135,7 @@ main(argc, argv)
 		format = *argv + 1;

 	(void)strftime(buf, sizeof(buf), format, localtime(&tval));
-	(void)printf("%s\n", buf);
+	(void)printf("%s", buf);
 	exit(retval);
 }

@@ -215,8 +210,10 @@ setthetime(p)
 		logwtmp("|", "date", "");
 		tv.tv_sec = tval;
 		tv.tv_usec = 0;
-		if (settimeofday(&tv, (struct timezone *)NULL))
-			err(1, "settimeofday (timeval)");
+		if (settimeofday(&tv, NULL)) {
+			perror("date: settimeofday");
+			exit(1);
+		}
 		logwtmp("{", "date", "");
 	}

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

 int	netsettime __P((time_t));
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	netdate.c,v 1.3 1995/05/30 00:06:41 rgrimes Exp
+ *	$Id$
 */

 #ifndef lint
@@ -169,7 +169,7 @@ loop:
 			(void)close(s);
 			return (0);
 		default:
-			warnx("wrong ack received from timed: %s",
+			warnx("wrong ack received from timed: %s", 
 			    tsptype[msg.tsp_type]);
 			timed_ack = -1;
 			break;
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	Makefile,v 1.2 1994/09/24 02:54:40 davidg Exp
+#	$Id$

 PROG=	dd
 SRCS=	args.c conv.c conv_tab.c dd.c misc.c position.c
@@ -34,7 +34,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	args.c,v 1.3 1994/09/24 02:54:42 davidg Exp
+ *	$Id$
 */

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

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

 #ifndef lint
@@ -71,10 +71,76 @@ static char sccsid[] = "@(#)conv_tab.c	8.1 (Berkeley) 5/31/93";
 */

 /* Lower-case to upper-case */
-u_char l2u[256];
+u_char l2u[] = {
+	0000, 0001, 0002, 0003, 0004, 0005, 0006, 0007,		/* 0000 */
+	0010, 0011, 0012, 0013, 0014, 0015, 0016, 0017,		/* 0010 */
+	0020, 0021, 0022, 0023, 0024, 0025, 0026, 0027,		/* 0020 */
+	0030, 0031, 0032, 0033, 0034, 0035, 0036, 0037,		/* 0030 */
+	0040, 0041, 0042, 0043, 0044, 0045, 0046, 0047,		/* 0040 */
+	0050, 0051, 0052, 0053, 0054, 0055, 0056, 0057,		/* 0050 */
+	0060, 0061, 0062, 0063, 0064, 0065, 0066, 0067,		/* 0060 */
+	0070, 0071, 0072, 0073, 0074, 0075, 0076, 0077,		/* 0070 */
+	0100, 0101, 0102, 0103, 0104, 0105, 0106, 0107,		/* 0100 */
+	0110, 0111, 0112, 0113, 0114, 0115, 0116, 0117,		/* 0110 */
+	0120, 0121, 0122, 0123, 0124, 0125, 0126, 0127,		/* 0120 */
+	0130, 0131, 0132, 0133, 0134, 0135, 0136, 0137,		/* 0130 */
+	0140, 0101, 0102, 0103, 0104, 0105, 0106, 0107,		/* 0140 */
+	0110, 0111, 0112, 0113, 0114, 0115, 0116, 0117,		/* 0150 */
+	0120, 0121, 0122, 0123, 0124, 0125, 0126, 0127,		/* 0160 */
+	0130, 0131, 0132, 0173, 0174, 0175, 0176, 0177,		/* 0170 */
+	0200, 0201, 0202, 0203, 0204, 0205, 0206, 0207,		/* 0200 */
+	0210, 0211, 0212, 0213, 0214, 0215, 0216, 0217,		/* 0210 */
+	0220, 0221, 0222, 0223, 0224, 0225, 0226, 0227,		/* 0220 */
+	0230, 0231, 0232, 0233, 0234, 0235, 0236, 0237,		/* 0230 */
+	0240, 0241, 0242, 0243, 0244, 0245, 0246, 0247,		/* 0240 */
+	0250, 0251, 0252, 0253, 0254, 0255, 0256, 0257,		/* 0250 */
+	0260, 0261, 0262, 0263, 0264, 0265, 0266, 0267,		/* 0260 */
+	0270, 0271, 0272, 0273, 0274, 0275, 0276, 0277,		/* 0270 */
+	0300, 0301, 0302, 0303, 0304, 0305, 0306, 0307,		/* 0300 */
+	0310, 0311, 0312, 0313, 0314, 0315, 0316, 0317,		/* 0310 */
+	0320, 0321, 0322, 0323, 0324, 0325, 0326, 0327,		/* 0320 */
+	0330, 0331, 0332, 0333, 0334, 0335, 0336, 0337,		/* 0330 */
+	0340, 0341, 0342, 0343, 0344, 0345, 0346, 0347,		/* 0340 */
+	0350, 0351, 0352, 0353, 0354, 0355, 0356, 0357,		/* 0350 */
+	0360, 0361, 0362, 0363, 0364, 0365, 0366, 0367,		/* 0360 */
+	0370, 0371, 0372, 0373, 0374, 0375, 0376, 0377,		/* 0370 */
+};

 /* Upper-case to lower-case */
-u_char u2l[256];
+u_char u2l[] = {
+	0000, 0001, 0002, 0003, 0004, 0005, 0006, 0007,		/* 0000 */
+	0010, 0011, 0012, 0013, 0014, 0015, 0016, 0017,		/* 0010 */
+	0020, 0021, 0022, 0023, 0024, 0025, 0026, 0027,		/* 0020 */
+	0030, 0031, 0032, 0033, 0034, 0035, 0036, 0037,		/* 0030 */
+	0040, 0041, 0042, 0043, 0044, 0045, 0046, 0047,		/* 0040 */
+	0050, 0051, 0052, 0053, 0054, 0055, 0056, 0057,		/* 0050 */
+	0060, 0061, 0062, 0063, 0064, 0065, 0066, 0067,		/* 0060 */
+	0070, 0071, 0072, 0073, 0074, 0075, 0076, 0077,		/* 0070 */
+	0100, 0141, 0142, 0143, 0144, 0145, 0146, 0147,		/* 0100 */
+	0150, 0151, 0152, 0153, 0154, 0155, 0156, 0157,		/* 0110 */
+	0160, 0161, 0162, 0163, 0164, 0165, 0166, 0167,		/* 0120 */
+	0170, 0171, 0172, 0133, 0134, 0135, 0136, 0137,		/* 0130 */
+	0140, 0141, 0142, 0143, 0144, 0145, 0146, 0147,		/* 0140 */
+	0150, 0151, 0152, 0153, 0154, 0155, 0156, 0157,		/* 0150 */
+	0160, 0161, 0162, 0163, 0164, 0165, 0166, 0167,		/* 0160 */
+	0170, 0171, 0172, 0173, 0174, 0175, 0176, 0177,		/* 0170 */
+	0200, 0201, 0202, 0203, 0204, 0205, 0206, 0207,		/* 0200 */
+	0210, 0211, 0212, 0213, 0214, 0215, 0216, 0217,		/* 0210 */
+	0220, 0221, 0222, 0223, 0224, 0225, 0226, 0227,		/* 0220 */
+	0230, 0231, 0232, 0233, 0234, 0235, 0236, 0237,		/* 0230 */
+	0240, 0241, 0242, 0243, 0244, 0245, 0246, 0247,		/* 0240 */
+	0250, 0251, 0252, 0253, 0254, 0255, 0256, 0257,		/* 0250 */
+	0260, 0261, 0262, 0263, 0264, 0265, 0266, 0267,		/* 0260 */
+	0270, 0271, 0272, 0273, 0274, 0275, 0276, 0277,		/* 0270 */
+	0300, 0301, 0302, 0303, 0304, 0305, 0306, 0307,		/* 0300 */
+	0310, 0311, 0312, 0313, 0314, 0315, 0316, 0317,		/* 0310 */
+	0320, 0321, 0322, 0323, 0324, 0325, 0326, 0327,		/* 0320 */
+	0330, 0331, 0332, 0333, 0334, 0335, 0336, 0337,		/* 0330 */
+	0340, 0341, 0342, 0343, 0344, 0345, 0346, 0347,		/* 0340 */
+	0350, 0351, 0352, 0353, 0354, 0355, 0356, 0357,		/* 0350 */
+	0360, 0361, 0362, 0363, 0364, 0365, 0366, 0367,		/* 0360 */
+	0370, 0371, 0372, 0373, 0374, 0375, 0376, 0377,		/* 0370 */
+};

 /* EBCDIC to ASCII -- 32V compatible. */
 u_char e2a_32V[] = {
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dd.1	8.2 (Berkeley) 1/13/94
-.\"	dd.1,v 1.2 1994/09/24 02:54:49 davidg Exp
+.\"	$Id$
 .\"
 .Dd January 13, 1994
 .Dt DD 1
@@ -34,7 +34,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	dd.c,v 1.4 1995/01/17 23:04:29 ache Exp
+ *	$Id$
 */

 #ifndef lint
@@ -177,40 +177,26 @@ setup()
 	if (ddflags & (C_LCASE|C_UCASE))
 		if (ddflags & C_ASCII)
 			if (ddflags & C_LCASE) {
-				for (cnt = 0; cnt <= 0377; ++cnt)
+				for (cnt = 0; cnt < 0377; ++cnt)
 					if (isupper(ctab[cnt]))
 						ctab[cnt] = tolower(ctab[cnt]);
 			} else {
-				for (cnt = 0; cnt <= 0377; ++cnt)
+				for (cnt = 0; cnt < 0377; ++cnt)
 					if (islower(ctab[cnt]))
 						ctab[cnt] = toupper(ctab[cnt]);
 			}
 		else if (ddflags & C_EBCDIC)
 			if (ddflags & C_LCASE) {
-				for (cnt = 0; cnt <= 0377; ++cnt)
+				for (cnt = 0; cnt < 0377; ++cnt)
 					if (isupper(cnt))
 						ctab[cnt] = ctab[tolower(cnt)];
 			} else {
-				for (cnt = 0; cnt <= 0377; ++cnt)
+				for (cnt = 0; cnt < 0377; ++cnt)
 					if (islower(cnt))
 						ctab[cnt] = ctab[toupper(cnt)];
 			}
-		else {
+		else
 			ctab = ddflags & C_LCASE ? u2l : l2u;
-			if (ddflags & C_LCASE) {
-				for (cnt = 0; cnt <= 0377; ++cnt)
-					if (isupper(cnt))
-						ctab[cnt] = tolower(cnt);
-					else
-						ctab[cnt] = cnt;
-			} else {
-				for (cnt = 0; cnt <= 0377; ++cnt)
-					if (islower(cnt))
-						ctab[cnt] = toupper(cnt);
-					else
-						ctab[cnt] = cnt;
-			}
-		}
 	(void)time(&st.start);			/* Statistics timestamp. */
 }

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

 /* Input/output stream state. */
@@ -35,7 +35,7 @@
 * SUCH DAMAGE.
 *
 *	@(#)extern.h	8.3 (Berkeley) 4/2/94
- *	extern.h,v 1.2 1994/09/24 02:54:57 davidg Exp
+ *	$Id$
 */

 #include <sys/cdefs.h>
@@ -34,7 +34,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	misc.c,v 1.2 1994/09/24 02:55:01 davidg Exp
+ *	$Id$
 */

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

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

 PROG=	df
 BINGRP=	operator
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)df.1	8.2 (Berkeley) 1/13/94
-.\"	df.1,v 1.3 1994/09/24 02:55:08 davidg Exp
+.\"	$Id$
 .\"
 .Dd January 13, 1994
 .Dt DF 1
@@ -35,7 +35,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	df.c,v 1.7 1995/05/30 00:06:42 rgrimes Exp
+ *	$Id$
 */

 #ifndef lint
@@ -76,30 +76,29 @@ struct typetab {
 	char *str;
 	long types;
 } typetab[] = {
-	{"ufs",		MT(MOUNT_UFS)},
-	{"local",	MT_LOCAL},
-	{"all",		MT_ALL},
-	{"nfs",		MT(MOUNT_NFS)},
-	{"mfs",		MT(MOUNT_MFS)},
-	{"lfs",		MT(MOUNT_LFS)},
-	{"msdos",	MT(MOUNT_MSDOS)},
-	{"fdesc",	MT(MOUNT_FDESC)},
-	{"portal",	MT(MOUNT_PORTAL)},
+	"ufs",		MT(MOUNT_UFS),
+	"local",	MT_LOCAL,
+	"all",		MT_ALL,
+	"nfs",		MT(MOUNT_NFS),
+	"mfs",		MT(MOUNT_MFS),
+	"lfs",		MT(MOUNT_LFS),
+	"msdos",	MT(MOUNT_MSDOS),
+	"fdesc",	MT(MOUNT_FDESC),
+	"portal",	MT(MOUNT_PORTAL),
 #if 0
 	/* return fsid of underlying FS */
-	{"lofs",	MT(MOUNT_LOFS)},
-	{"null",	MT(MOUNT_NULL)},
-	{"umap",	MT(MOUNT_UMAP)},
+	"lofs",		MT(MOUNT_LOFS),
+	"null",		MT(MOUNT_NULL),
+	"umap",		MT(MOUNT_UMAP),
 #endif
-	{"kernfs",	MT(MOUNT_KERNFS)},
-	{"procfs",	MT(MOUNT_PROCFS)},
-	{"afs",		MT(MOUNT_AFS)},
-	{"iso9660fs",	MT(MOUNT_CD9660)},
-	{"cdfs",	MT(MOUNT_CD9660)},
-	{"misc",	MT(MOUNT_LOFS)|MT(MOUNT_FDESC)|MT(MOUNT_PORTAL)|
-			MT(MOUNT_KERNFS)|MT(MOUNT_PROCFS)},
-	{NULL,		0}
-
+	"kernfs",	MT(MOUNT_KERNFS),
+	"procfs",	MT(MOUNT_PROCFS),
+	"afs",		MT(MOUNT_AFS),
+	"iso9660fs",	MT(MOUNT_CD9660),
+	"cdfs",		MT(MOUNT_CD9660),
+	"misc",		MT(MOUNT_LOFS)|MT(MOUNT_FDESC)|MT(MOUNT_PORTAL)|
+			MT(MOUNT_KERNFS)|MT(MOUNT_PROCFS),
+	NULL,		0
 };

 long	addtype __P((long, char *));
@@ -125,7 +124,6 @@ main(argc, argv)
 	char *mntpt;

 	iflag = nflag = tflag = 0;
-	fsmask = MT_NONE;

 	while ((ch = getopt(argc, argv, "iknt:")) != EOF)
 		switch (ch) {
@@ -336,7 +334,7 @@ prtstat(sfsp, maxwidth)
 		used = inodes - sfsp->f_ffree;
 		(void)printf(" %7ld %7ld %5.0f%% ", used, sfsp->f_ffree,
 		   inodes == 0 ? 100.0 : (double)used / (double)inodes * 100.0);
-	} else
+	} else 
 		(void)printf("  ");
 	(void)printf("  %s\n", sfsp->f_mntonname);
 }
@@ -424,7 +422,7 @@ bread(off, buf, cnt)
 void
 usage()
 {
-	fprintf(stderr,
+	fprintf(stderr, 
 		"usage: df [-ikn] [-t fstype] [file | file_system ...]\n");
 	exit(1);
 }
@@ -1,4 +1,4 @@
-#	Makefile,v 1.1 1994/09/18 21:23:35 wollman Exp
+#	$Id$

 PROG=	domainname

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)hostname.1	8.1 (Berkeley) 5/31/93
-.\"	domainname.1,v 1.2 1995/01/14 17:02:33 ats Exp
+.\"	$Id$
 .\"
 .Dd September 18, 1994
 .Dt DOMAINNAME 1
@@ -55,7 +55,7 @@ domain name does not necessarily have anything to do with the Domain
 Name System domain name, although they are often set equal for administrative
 convenience.
 .Sh SEE ALSO
-.Xr getdomainname 3
+.Xr getdomainname 2
 .Sh HISTORY
 The
 .Nm 
@@ -40,7 +40,7 @@ static char copyright[] =
 #ifndef lint
 /*static char sccsid[] = "From: @(#)hostname.c	8.1 (Berkeley) 5/31/93"; */
 static const char rcsid[] =
-	"domainname.c,v 1.5 1995/03/19 13:28:17 joerg Exp";
+	"$Id: domainname.c,v 1.3 1994/09/21 22:30:55 bde Exp $";
 #endif /* not lint */

 #include <sys/param.h>
@@ -56,7 +56,7 @@ main(argc,argv)
 	int argc;
 	char *argv[];
 {
-	char domainname[MAXHOSTNAMELEN];
+	char *p, domainname[MAXHOSTNAMELEN];

 	argc--, argv++;

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

 PROG=	echo

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)echo.1	8.1 (Berkeley) 7/22/93
-.\"	echo.1,v 1.2 1994/09/24 02:55:17 davidg Exp
+.\"	$Id$
 .\"
 .Dd July 22, 1993
 .Dt ECHO 1
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	echo.c,v 1.2 1994/09/24 02:55:18 davidg Exp
+ *	$Id$
 */

 #ifndef lint
@@ -1,8 +1,14 @@
-#	Makefile,v 1.10 1994/12/18 15:15:10 jkh Exp
+#	$Id: Makefile,v 1.8 1994/09/24 02:55:20 davidg Exp $

 PROG=	ed
 SRCS=	 buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c
 LINKS=  ${BINDIR}/ed ${BINDIR}/red
 MLINKS= ed.1 red.1

+.if !defined(NOCRYPT)
+CFLAGS+=-DDES
+LDADD+= -lcrypt
+DPADD+= ${LIBCRYPT}
+.endif
+
 .include <bsd.prog.mk>
@@ -1,4 +1,4 @@
-POSIX,v 1.4 1994/09/24 02:55:20 davidg Exp
+$Id$

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

 ed is an 8-bit-clean, POSIX-compliant line editor.  It should work with
 any regular expression package that conforms to the POSIX interface
@@ -25,7 +25,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	buf.c,v 1.7 1995/05/30 00:06:43 rgrimes Exp
+ *	$Id$
 */
 #ifndef lint
 static char *rcsid = "@(#)buf.c,v 1.4 1994/02/01 00:34:35 alm Exp";
@@ -253,7 +253,7 @@ init_buffers()
 {
 	int i = 0;

-	/* Read stdin one character at a time to avoid i/o contention
+	/* Read stdin one character at a time to avoid i/o contention 
 	   with shell escapes invoked by nonterminal input, e.g.,
 	   ed - <<EOF
 	   !cat
@@ -35,7 +35,7 @@
 * SUCH DAMAGE.
 *
 *	from: @(#)bdes.c	5.5 (Berkeley) 6/27/91
- *	cbc.c,v 1.5 1995/03/19 13:28:24 joerg Exp
+ *	$Id$
 */

 #ifndef lint
@@ -115,7 +115,7 @@ init_des_cipher()

 	des_ct = des_n = 0;

-	/* initialize the initialization vector */
+	/* initialize the initialization vctor */
 	MEMZERO(ivec, 8);

 	/* intialize the padding vector */
@@ -137,8 +137,6 @@ get_des_char(fp)
 		des_ct = cbc_decode(des_buf, fp);
 	}
 	return (des_ct > 0) ? des_buf[des_n++] : EOF;
-#else
-	return (getc(fp));
 #endif
 }

@@ -155,8 +153,6 @@ put_des_char(c, fp)
 		des_n = 0;
 	}
 	return (des_ct >= 0) ? (des_buf[des_n++] = c) : EOF;
-#else
-	return (fputc(c, fp));
 #endif
 }

@@ -172,8 +168,6 @@ flush_des_file(fp)
 		des_n = 0;
 	}
 	return (des_ct >= 0 && cbc_encode(des_buf, des_n, fp) >= 0) ? 0 : EOF;
-#else
-	return (fflush(fp));
 #endif
 }

@@ -1,4 +1,4 @@
-.\"	ed.1,v 1.6 1994/09/24 02:55:24 davidg Exp
+.\"	$Id$
 .TH ED 1 "21 May 1993"
 .SH NAME
 .\" ed, red \- text editor
@@ -25,7 +25,7 @@
 * SUCH DAMAGE.
 *
 *	@(#)ed.h,v 1.5 1994/02/01 00:34:39 alm Exp
- *	ed.h,v 1.8 1994/11/03 21:46:55 davidg Exp
+ *	$Id: ed.h,v 1.7 1994/09/24 02:55:25 davidg Exp $
 */

 #include <sys/types.h>
@@ -25,7 +25,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	glbl.c,v 1.4 1995/05/30 00:06:46 rgrimes Exp
+ *	$Id$
 */

 #ifndef lint
@@ -132,8 +132,8 @@ exec_global(interact, gflag)
 		for (; *ibufp;)
 			if ((status = extract_addr_range()) < 0 ||
 			    (status = exec_command()) < 0 ||
-			    (status > 0 && (status = display_lines(
-			    current_addr, current_addr, status)) < 0))
+			    status > 0 && (status = display_lines(
+			    current_addr, current_addr, status)) < 0)
 				return status;
 	}
 	return 0;
@@ -158,7 +158,7 @@ set_active_node(lp)
 #if defined(sun) || defined(NO_REALLOC_NULL)
 		if (active_list != NULL) {
 #endif
-			if ((ts = (line_t **) realloc(active_list,
+			if ((ts = (line_t **) realloc(active_list, 
 			    (ti += MINBUFSZ) * sizeof(line_t **))) == NULL) {
 				fprintf(stderr, "%s\n", strerror(errno));
 				sprintf(errmsg, "out of memory");
@@ -167,7 +167,7 @@ set_active_node(lp)
 			}
 #if defined(sun) || defined(NO_REALLOC_NULL)
 		} else {
-			if ((ts = (line_t **) malloc((ti += MINBUFSZ) *
+			if ((ts = (line_t **) malloc((ti += MINBUFSZ) * 
 			    sizeof(line_t **))) == NULL) {
 				fprintf(stderr, "%s\n", strerror(errno));
 				sprintf(errmsg, "out of memory");
@@ -24,7 +24,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	io.c,v 1.4 1995/03/19 13:28:32 joerg Exp
+ *	$Id$
 */

 #ifndef lint
@@ -106,7 +106,7 @@ read_stream(fp, n)
 		return ERR;
 	if (appended && size && o_isbinary && o_newline_added)
 		fputs("newline inserted\n", stderr);
-	else if (newline_added && (!appended || (!isbinary && !o_isbinary)))
+	else if (newline_added && (!appended || !isbinary && !o_isbinary))
 		fputs("newline appended\n", stderr);
 	if (isbinary && newline_added && !appended)
 	    	size += 1;
@@ -128,8 +128,8 @@ get_stream_line(fp)
 	register int c;
 	register int i = 0;

-	while (((c = des ? get_des_char(fp) : getc(fp)) != EOF || (!feof(fp) &&
-	    !ferror(fp))) && c != '\n') {
+	while (((c = des ? get_des_char(fp) : getc(fp)) != EOF || !feof(fp) &&
+	    !ferror(fp)) && c != '\n') {
 		REALLOC(sbuf, sbufsz, i + 1, ERR);
 		if (!(sbuf[i++] = c))
 			isbinary = 1;
@@ -25,7 +25,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	main.c,v 1.5 1995/05/30 00:06:47 rgrimes Exp
+ *	$Id$
 */

 #ifndef lint
@@ -42,7 +42,7 @@ static char *rcsid = "@(#)main.c,v 1.1 1994/02/01 00:34:42 alm Exp";
 * CREDITS
 *
 *	This program is based on the editor algorithm described in
- *	Brian W. Kernighan and P. J. Plauger's book "Software Tools
+ *	Brian W. Kernighan and P. J. Plauger's book "Software Tools 
 *	in Pascal," Addison-Wesley, 1981.
 *
 *	The buffering algorithm is attributed to Rodney Ruddock of
@@ -154,9 +154,9 @@ top:
 	signal(SIGQUIT, SIG_IGN);
 	signal(SIGINT, signal_int);
 #ifdef _POSIX_SOURCE
-	if ((status = sigsetjmp(env, 1)))
+	if (status = sigsetjmp(env, 1))
 #else
-	if ((status = setjmp(env)))
+	if (status = setjmp(env))
 #endif
 	{
 		fputs("\n?\n", stderr);
@@ -192,7 +192,7 @@ top:
 				fputs("?\n", stderr);
 				sprintf(errmsg, "warning: file modified");
 				if (!isatty(0)) {
-					fprintf(stderr, garrulous ?
+					fprintf(stderr, garrulous ? 
 					    "script, line %d: %s\n" :
 					    "", lineno, errmsg);
 					quit(2);
@@ -213,7 +213,7 @@ top:
 		isglobal = 0;
 		if ((status = extract_addr_range()) >= 0 &&
 		    (status = exec_command()) >= 0)
-			if (!status ||
+			if (!status || status &&
 			    (status = display_lines(current_addr, current_addr,
 			        status)) >= 0)
 				continue;
@@ -225,16 +225,16 @@ top:
 			fputs("?\n", stderr);		/* give warning */
 			sprintf(errmsg, "warning: file modified");
 			if (!isatty(0)) {
-				fprintf(stderr, garrulous ?
-				    "script, line %d: %s\n" :
+				fprintf(stderr, garrulous ? 
+				    "script, line %d: %s\n" : 
 				    "", lineno, errmsg);
 				quit(2);
 			}
 			break;
 		case FATAL:
 			if (!isatty(0))
-				fprintf(stderr, garrulous ?
-				    "script, line %d: %s\n" : "",
+				fprintf(stderr, garrulous ? 
+				    "script, line %d: %s\n" : "", 
 				    lineno, errmsg);
 			else
 				fprintf(stderr, garrulous ? "%s\n" : "",
@@ -243,7 +243,7 @@ top:
 		default:
 			fputs("?\n", stderr);
 			if (!isatty(0)) {
-				fprintf(stderr, garrulous ?
+				fprintf(stderr, garrulous ? 
 				    "script, line %d: %s\n" : "",
 				    lineno, errmsg);
 				quit(2);
@@ -256,7 +256,7 @@ top:

 long first_addr, second_addr, addr_cnt;

-/* extract_addr_range: get line addresses from the command buffer until an
+/* extract_addr_range: get line addresses from the command buffer until an 
   illegal address is seen; return status */
 int
 extract_addr_range()
@@ -544,11 +544,11 @@ exec_command()
 			return ERR;
 		else if (build_active_list(c == 'g' || c == 'G') < 0)
 			return ERR;
-		else if ((n = (c == 'G' || c == 'V')))
+		else if (n = (c == 'G' || c == 'V'))
 			GET_COMMAND_SUFFIX();
 		isglobal++;
 		if (exec_global(n, gflag) < 0)
-			return ERR;
+			return ERR; 
 		break;
 	case 'h':
 		if (addr_cnt > 0) {
@@ -691,7 +691,7 @@ exec_command()
 				sflags |= SGR;
 				ibufp++;
 				break;
-			case '0': case '1': case '2': case '3': case '4':
+			case '0': case '1': case '2': case '3': case '4': 
 			case '5': case '6': case '7': case '8': case '9':
 				STRTOL(sgnum, ibufp);
 				sflags |= SGF;
@@ -802,7 +802,7 @@ exec_command()
 			return ERR;
 		}
 #endif
-		if ((addr = write_file(*fnp ? fnp : old_filename,
+		if ((addr = write_file(*fnp ? fnp : old_filename, 
 		    (c == 'W') ? "a" : "w", first_addr, second_addr)) < 0)
 			return ERR;
 		else if (addr == addr_last)
@@ -840,7 +840,7 @@ exec_command()
 		break;
 	case '=':
 		GET_COMMAND_SUFFIX();
-		printf("%ld\n", addr_cnt ? second_addr : addr_last);
+		printf("%d\n", addr_cnt ? second_addr : addr_last);
 		break;
 	case '!':
 		if (addr_cnt > 0) {
@@ -888,7 +888,7 @@ check_addr_range(n, m)
 }


-/* get_matching_node_addr: return the address of the next line matching a
+/* get_matching_node_addr: return the address of the next line matching a 
   pattern in a given direction.  wrap around begin/end of editor buffer if
   necessary */
 long
@@ -902,7 +902,7 @@ get_matching_node_addr(pat, dir)

 	if (!pat) return ERR;
 	do {
-	       if ((n = dir ? INC_MOD(n, addr_last) : DEC_MOD(n, addr_last))) {
+		if (n = dir ? INC_MOD(n, addr_last) : DEC_MOD(n, addr_last)) {
 			lp = get_addressed_line_node(n);
 			if ((s = get_sbuf_line(lp)) == NULL)
 				return ERR;
@@ -910,7 +910,7 @@ get_matching_node_addr(pat, dir)
 				NUL_TO_NEWLINE(s, lp->len);
 			if (!regexec(pat, s, 0, NULL, 0))
 				return n;
-	       }
+		}
 	} while (n != current_addr);
 	sprintf(errmsg, "no match");
 	return  ERR;
@@ -1148,7 +1148,7 @@ move_lines(addr)
 		REQUE(b2, b1->q_forw);
 		REQUE(a1->q_back, a2);
 		REQUE(b1, a1);
-		current_addr = addr + ((addr < first_addr) ?
+		current_addr = addr + ((addr < first_addr) ? 
 		    second_addr - first_addr + 1 : 0);
 	}
 	if (isglobal)
@@ -1339,7 +1339,7 @@ strip_escapes(s)

 	REALLOC(file, filesz, MAXPATHLEN + 1, NULL);
 	/* assert: no trailing escape */
-	while ((file[i++] = (*s == '\\') ? *++s : *s))
+	while (file[i++] = (*s == '\\') ? *++s : *s)
 		s++;
 	return file;
 }
@@ -25,7 +25,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	re.c,v 1.10 1995/05/30 00:06:47 rgrimes Exp
+ *	$Id$
 */

 #ifndef lint
@@ -39,7 +39,7 @@ extern int patlock;

 char errmsg[MAXPATHLEN + 40] = "";

-/* get_compiled_pattern: return pointer to compiled pattern from command
+/* get_compiled_pattern: return pointer to compiled pattern from command 
   buffer */
 pattern_t *
 get_compiled_pattern()
@@ -67,7 +67,7 @@ get_compiled_pattern()
 		return NULL;
 	}
 	patlock = 0;
-	if ((n = regcomp(exp, exps, 0))) {
+	if (n = regcomp(exp, exps, 0)) {
 		regerror(n, exp, errmsg, sizeof errmsg);
 		free(exp);
 		return exp = NULL;
@@ -1,4 +1,4 @@
-/* sub.c: This file contains the substitution routines for the ed
+/* sub.c: This file contains the substitution routines for the ed 
   line editor */
 /*-
 * Copyright (c) 1993 Andrew Moore, Talke Studio.
@@ -25,7 +25,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	sub.c,v 1.6 1995/05/30 00:06:48 rgrimes Exp
+ *	$Id$
 */

 #ifndef lint
@@ -97,7 +97,7 @@ extract_subst_template()
 			;
 		else if (!isglobal) {
 			while ((n = get_tty_line()) == 0 ||
-			    (n > 0 && ibuf[n - 1] != '\n'))
+			    n > 0 && ibuf[n - 1] != '\n')
 				clearerr(stdin);
 			if (n < 0)
 				return NULL;
@@ -124,7 +124,6 @@ search_and_replace(pat, gflag, kth)
 	char *txt;
 	char *eot;
 	long lc;
-	long xa = current_addr;
 	int nsubs = 0;
 	line_t *lp;
 	int len;
@@ -155,10 +154,8 @@ search_and_replace(pat, gflag, kth)
 			} while (txt != eot);
 			SPL0();
 			nsubs++;
-			xa = current_addr;
 		}
 	}
-	current_addr = xa;
 	if  (nsubs == 0 && !(gflag & GLB)) {
 		sprintf(errmsg, "no match");
 		return ERR;
@@ -188,7 +185,7 @@ substitute_matching_text(pat, lp, gflag, kth)

 	if ((txt = get_sbuf_line(lp)) == NULL)
 		return ERR;
-	if (isbinary)
+	if (isbinary) 
 		NUL_TO_NEWLINE(txt, lp->len);
 	eot = txt + lp->len;
 	if (!regexec(pat, txt, SE_MAX, rm, 0)) {
@@ -213,9 +210,8 @@ substitute_matching_text(pat, lp, gflag, kth)
 				off += i;
 			}
 			txt += rm[0].rm_eo;
-		} while (*txt &&
-                        (!changed || ((gflag & GSG) && rm[0].rm_eo)) &&
-		        !regexec(pat, txt, SE_MAX, rm, REG_NOTBOL));
+		} while (*txt && (!changed || (gflag & GSG) && rm[0].rm_eo) &&
+		    !regexec(pat, txt, SE_MAX, rm, REG_NOTBOL));
 		i = eot - txt;
 		REALLOC(rbuf, rbufsz, off + i + 2, ERR);
 		if (i > 0 && !rm[0].rm_eo && (gflag & GSG)) {
Author	SHA1	Message	Date
Jordan K. Hubbard	324ec40db3	Tell stupid users to write the bootcode.	1994-11-22 10:58:58 +00:00
cvs2svn	17b0776217	This commit was manufactured by cvs2svn to create branch 'RELEASE_2_0'.	1994-11-22 10:57:37 +00:00
Jordan K. Hubbard	8d77b4e304	Fix some wonkiness in MY code this time. Sigh..	1994-11-22 10:40:44 +00:00
Jordan K. Hubbard	157002a7fa	Fix some 11th-hour wonkiness in Poul's code.	1994-11-22 10:37:25 +00:00
Poul-Henning Kamp	4c731d7856	-> RELEASE	1994-11-22 06:32:34 +00:00
cvs2svn	1afa50deb4	This commit was manufactured by cvs2svn to create branch 'RELEASE_2_0'.	1994-11-22 06:28:23 +00:00
Poul-Henning Kamp	5cc13c0e22	-> RELEASE_2_0	1994-11-22 06:28:22 +00:00
cvs2svn	9f0dc73359	This commit was manufactured by cvs2svn to create branch 'BETA_2_0'.	1994-11-21 11:18:49 +00:00
Jordan K. Hubbard	32cd273372	Put the cursor back in the right place. Pretty up the help text.	1994-11-21 10:51:15 +00:00
Poul-Henning Kamp	92c9323d3b	Tell Jordan when he has destroyed his disk.	1994-11-21 08:11:11 +00:00
cvs2svn	01233029ed	This commit was manufactured by cvs2svn to create branch 'BETA_2_0'.	1994-11-21 07:33:22 +00:00
Poul-Henning Kamp	c264e2c65c	declare atdevbase (this is on the branch of the tree)	1994-11-19 19:07:38 +00:00
Poul-Henning Kamp	45728f7c5d	On the ALPHA-branch: 2.0-BETA now	1994-11-16 06:33:27 +00:00
cvs2svn	e382a3a979	This commit was manufactured by cvs2svn to create branch 'ALPHA_2_0'.	1994-11-09 20:27:33 +00:00
Poul-Henning Kamp	d216e1f6de	Set version correctly.	1994-11-08 21:24:57 +00:00
cvs2svn	f4856526c7	This commit was manufactured by cvs2svn to create branch 'ALPHA_2_0'.	1994-11-08 19:51:51 +00:00