MFC: printf-style format fix. warn(string) -> warn("%s", string)

from "default" don't overflow it.

Makefile

@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.57.4.7 1995/11/09 10:57:04 jkh Exp $
+# $FreeBSD$
 #
 # Make command line options:
 #	-DCLOBBER will remove /usr/include and MOST of /usr/lib
@@ -7,6 +7,7 @@
 #	-DMAKE_EBONES to build eBones (KerberosIV)
 #
 #	-DNOCLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
+#	-DNOCLEAN to not clean anything at all
 #	-DNOCRYPT will prevent building of crypt versions
 #	-DNOLKM do not build loadable kernel modules
 #	-DNOOBJDIR do not run ``${MAKE} obj''
@@ -85,19 +86,27 @@ OBJDIR=
 .else
 OBJDIR=		obj
 .endif
+
+.if defined(NOCLEAN)
+CLEANDIR=
+WORLD_CLEANDIST=obj
+.else
+WORLD_CLEANDIST=cleandist
 .if defined(NOCLEANDIR)
 CLEANDIR=	clean
 .else
 CLEANDIR=	cleandir
 .endif
+.endif
 
-world:	hierarchy mk cleandist includes lib-tools libraries tools
+world:	hierarchy mk $(WORLD_CLEANDIST) include-tools includes lib-tools libraries build-tools
 	@echo "--------------------------------------------------------------"
 	@echo " Rebuilding ${DESTDIR} The whole thing"
 	@echo "--------------------------------------------------------------"
 	@echo
 	${MAKE} depend all install
 	cd ${.CURDIR}/share/man &&		${MAKE} makedb
+	@echo "make world completed on `date`"
 
 hierarchy:
 	@echo "--------------------------------------------------------------"
@@ -207,18 +216,23 @@ includes:
 .endif
 	cd ${.CURDIR}/include &&		${MAKE} install
 	cd ${.CURDIR}/gnu/include &&		${MAKE}	install
+	cd ${.CURDIR}/gnu/lib/libdialog &&	${MAKE} beforeinstall
+	cd ${.CURDIR}/gnu/lib/libg++ &&		${MAKE} beforeinstall
+	cd ${.CURDIR}/gnu/lib/libgmp &&		${MAKE} beforeinstall
+	cd ${.CURDIR}/gnu/lib/libmp &&		${MAKE} beforeinstall
 	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(eBones) && !defined(NOCRYPT) && defined(MAKE_EBONES)
 	cd ${.CURDIR}/eBones/include &&		${MAKE} beforeinstall
 	cd ${.CURDIR}/eBones/lib/libkrb &&	${MAKE} beforeinstall
 	cd ${.CURDIR}/eBones/lib/libkadm &&	${MAKE} beforeinstall
 .endif
+	cd ${.CURDIR}/lib/csu/${MACHINE} &&	${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libc &&		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libcurses &&		${MAKE} beforeinstall
+	cd ${.CURDIR}/lib/libdisk &&		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libedit &&		${MAKE} beforeinstall
+	cd ${.CURDIR}/lib/libftpio &&		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libmd &&		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libmytinfo &&		${MAKE}	beforeinstall
 	cd ${.CURDIR}/lib/libncurses &&		${MAKE}	beforeinstall
@@ -231,14 +245,19 @@ includes:
 	cd ${.CURDIR}/lib/libtermcap &&		${MAKE}	beforeinstall
 	cd ${.CURDIR}/lib/libcom_err &&		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libss &&		${MAKE} beforeinstall
-	cd ${.CURDIR}/lib/libforms &&		${MAKE}	beforeinstall
 	cd ${.CURDIR}/lib/libscsi &&		${MAKE}	beforeinstall
+	cd ${.CURDIR}/lib/libutil &&		${MAKE}	beforeinstall
+.if exists(secure) && !defined(NOCRYPT) && !defined(NOSECURE)
+	cd ${.CURDIR}/secure/lib/libdes &&	${MAKE}	beforeinstall
+.endif
 
 lib-tools:
 	@echo "--------------------------------------------------------------"
 	@echo " Rebuilding tools needed to build the libraries"
 	@echo "--------------------------------------------------------------"
 	@echo
+	cd ${.CURDIR}/usr.bin/xinstall && \
+		${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
 	cd ${.CURDIR}/gnu/usr.bin/ld && \
 		${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
 	cd ${.CURDIR}/usr.bin/ar && \
@@ -276,6 +295,12 @@ libraries:
 	cd ${.CURDIR}/lib/libtermcap && \
 		${MAKE} depend all install
 .endif
+.if exists(lib)
+	cd ${.CURDIR}/lib/csu/i386 && \
+		${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
+	cd ${.CURDIR}/lib && \
+		${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
+.endif
 .if exists(gnu)
 	cd ${.CURDIR}/gnu/lib && \
 		${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
@@ -285,18 +310,10 @@ libraries:
 .if exists(secure) && !defined(NOCRYPT) && !defined(NOSECURE)
 	cd ${.CURDIR}/secure/lib && \
 		${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
-.endif
-.if exists(lib)
-	cd ${.CURDIR}/lib/csu/i386 && \
-		${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
-	cd ${.CURDIR}/lib && \
-		${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
 .endif
 	cd ${.CURDIR}/usr.bin/lex/lib && \
 		${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
 .if exists(eBones) && !defined(NOCRYPT) && defined(MAKE_EBONES)
-	cd ${.CURDIR}/eBones/des && \
-		${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
 	cd ${.CURDIR}/eBones/lib && \
 		${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
 .endif
@@ -305,18 +322,24 @@ libraries:
 		 ${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
 .endif
 
-tools:
+include-tools:
 	@echo "--------------------------------------------------------------"
-	@echo " Rebuilding ${DESTDIR} C compiler, make, sgmlfmt, and zic(8)"
+	@echo " Rebuilding tools needed to build the includes"
+	@echo "--------------------------------------------------------------"
+	@echo
+	cd ${.CURDIR}/usr.bin/xinstall && \
+		${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
+
+build-tools:
+	@echo "--------------------------------------------------------------"
+	@echo " Rebuilding ${DESTDIR} C compiler, make, and zic(8)"
 	@echo "--------------------------------------------------------------"
 	@echo
 	cd ${.CURDIR}/gnu/usr.bin/cc && \
 		${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
 	cd ${.CURDIR}/usr.bin/make && \
 		${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
-	cd ${.CURDIR}/usr.bin/sgmlfmt && \
-		${MAKE} depend all install ${CLEANDIR} ${OBJDIR} 
-	cd ${.CURDIR}/share/sgml && \
+	cd ${.CURDIR}/gnu/usr.bin/groff && \
 		${MAKE} depend all install ${CLEANDIR} ${OBJDIR} 
 	cd ${.CURDIR}/usr.sbin/zic && \
 		${MAKE} depend all install ${CLEANDIR} ${OBJDIR}

TODO

@@ -1,4 +1,4 @@
-; $Id: TODO,v 1.11 1995/04/05 13:16:30 jkh Exp $
+; $FreeBSD$
 
 ** To skip this preamble, search forward for the pattern `**'.
 
@@ -49,21 +49,12 @@ Thanks!
 
 ** --- cut here ---
 
-TASKID:	940820002
-TASK:	Add Linux/Crynwr compatible plip mode to lpt.c
-DETAIL: { Look at the crynwr packet-driver plip.asm (ftp::ftp.ftp.com)
-and the linux driver for reference. }
-EMAIL:	<phk>
-CATS:	kernel networking
-GRADE:	ADVANCED
-STATUS: OPEN (*)
-
 TASKID:	940820003
 TASK:	Add laptop-feature to wd.c
 DETAIL:	{ If disk just spun up, do sync when we have it running.  Need
 to detect that disk was turned off, e.g. had a long delay in becomming
 ready again. }
-EMAIL:	<phk>
+EMAIL:	<phk, nate>
 CATS:	kernel laptop
 GRADE:	INTERMEDIATE
 STATUS:	OPEN
@@ -76,21 +67,11 @@ also requires some modification of existing drivers to support being used
 by PCMCIA cards.  This task is both really hard and comparatively easy;
 hard because it's a big job, easy because others have already gone much of
 the way and you have their work for reference. }
-EMAIL:	<phk>
+EMAIL:	<phk, nate>
 CATS:	kernel laptop
 GRADE:	ADVANCED
 STATUS:	IN PROGRESS
 
-TASKID:	940820006
-TASK:	Add bootp/DHCP to the generic ethernet code.
-DETAIL:	{ Implement an ioctl(), which will send a bootp on a particular
-interface and return the data in a usable format. OR make a program which uses
-existing ioctls to do it.  See RFC153[34] for information on DHCP. }
-EMAIL:	<phk>
-CATS:	kernel networking
-GRADE:	ADVANCED
-STATUS:	OPEN (*)
-
 TASKID:	940820007
 TASK:	Add bootp/DHCP capability to slip driver.
 DETAIL: { Cisco's products implement this.  Both master and slave side would be
@@ -149,18 +130,3 @@ EMAIL:	<rgrimes, phk>
 CATS:	user
 GRADE:	INTERMEDIATE
 STATUS:	OPEN
-
-TASKID: 95031701
-TASK:	Implement a file system debugger (fsdb)
-DETAIL:	{ Traditionally, there has been a fsdb(8) program in Unix.
-This program is not part of 4.4BSD, but the current system lacks
-some utility to low-level step through the file system and repair
-(or damage:) something in case fsck tells about problems, but the
-administrator is unlucky with the suggested actions of fsck.
-The original fsdb had a terrible syntax, something more rationale
-should be built instead. }
-EMAIL:	<joerg>
-CATS:	user
-GRADE:	ADVANCED
-STATUS:	OPEN
-

bin/Makefile

@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+# $FreeBSD$
 
 SUBDIR=	cat chmod cp csh date dd df domainname echo ed expr hostname \
 	kill ln ls mkdir mv pax ps pwd rcp rm rmail rmdir sh sleep \

bin/Makefile.inc

@@ -1,4 +1,15 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 5/31/93
+# $FreeBSD$
 
 BINDIR?=	/bin
 NOSHARED?=	YES
+
+.if exists (${.CURDIR}/../../secure)
+
+.if exists(${.CURDIR}/../../secure/lib/libcipher/obj)
+CIPHEROBJDIR=    ${.CURDIR}/../../secure/lib/libcipher/obj
+.else
+CIPHEROBJDIR=    ${.CURDIR}/../../secure/lib/libcipher
+.endif
+
+.endif

bin/cat/Makefile

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	cat
 

bin/cat/cat.1

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)cat.1	8.1 (Berkeley) 6/29/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 29, 1993
 .Dt CAT 1

bin/cat/cat.c

@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cat.c,v 1.3 1995/10/03 12:46:37 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint

bin/chmod/Makefile

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	chmod
 

bin/chmod/chmod.1

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)chmod.1	8.4 (Berkeley) 3/31/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd March 31, 1994
 .Dt CHMOD 1
@@ -274,6 +274,7 @@ There's no
 .Ar perm
 option for the naughty bits.
 .Sh SEE ALSO
+.Xr chflags 1 ,
 .Xr install 1 ,
 .Xr chmod 2 ,
 .Xr stat 2 ,

bin/chmod/chmod.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: chmod.c,v 1.3 1995/02/03 22:21:09 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint

bin/cp/Makefile

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	cp
 SRCS=	cp.c utils.c

bin/cp/cp.1

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)cp.1	8.3 (Berkeley) 4/18/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd April 18, 1994
 .Dt CP 1

bin/cp/cp.c

@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cp.c,v 1.5 1995/04/02 00:49:16 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint

bin/cp/extern.h

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.2 (Berkeley) 4/1/94
- *	$Id$
+ * $FreeBSD$
  */
 
 typedef struct {

bin/cp/utils.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: utils.c,v 1.5 1995/10/03 12:55:01 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint

bin/csh/Makefile

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+# $FreeBSD$
 #
 # C Shell with process control; VM/UNIX VAX Makefile
 # Bill Joy UC Berkeley; Jim Kulp IIASA, Austria

bin/csh/USD.doc/Makefile

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 8/14/93
-#	$Id$
+# $FreeBSD$
 
 DIR=	usd/04.csh
 SRCS=	tabs csh.1 csh.2 csh.3 csh.4 csh.a csh.g

bin/csh/USD.doc/csh.1

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.1	8.1 (Berkeley) 6/8/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .EH 'USD:4-%''An Introduction to the C shell'
 .OH 'An Introduction to the C shell''USD:4-%'

bin/csh/USD.doc/csh.2

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.2	8.1 (Berkeley) 6/8/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .nr H1 1
 .NH

bin/csh/USD.doc/csh.3

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.3	8.1 (Berkeley) 6/8/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .nr H1 2
 .NH

bin/csh/USD.doc/csh.4

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.4	8.1 (Berkeley) 6/8/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .nr H1 3
 .NH

bin/csh/USD.doc/csh.a

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.a	8.1 (Berkeley) 6/8/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .SH
 Appendix \- Special characters

bin/csh/USD.doc/csh.g

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.g	8.1 (Berkeley) 6/8/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .SH
 Glossary

bin/csh/USD.doc/tabs

@@ -30,6 +30,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tabs	8.1 (Berkeley) 6/8/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .ta 5n 10n 15n 20n 25n 30n 35n 40n 45n 50n 55n 60n 65n 70n 75n 80n

bin/csh/alloc.c

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

bin/csh/char.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint

bin/csh/char.h

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)char.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <ctype.h>

bin/csh/const.c

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

bin/csh/csh.1

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)csh.1	8.2 (Berkeley) 1/21/94
-.\"	$Id: csh.1,v 1.2 1994/09/24 02:53:49 davidg Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 21, 1994
 .Dt CSH 1

bin/csh/csh.c

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

bin/csh/csh.h

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)csh.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ * $FreeBSD$
  */
 
 /*

bin/csh/dir.c

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

bin/csh/dir.h

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dir.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ * $FreeBSD$
  */
 
 /*

bin/csh/dol.c

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

bin/csh/err.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint

bin/csh/exec.c

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

bin/csh/exp.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint

bin/csh/extern.h

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <sys/cdefs.h>

bin/csh/file.c

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

bin/csh/func.c

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

bin/csh/glob.c

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

bin/csh/hist.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint

bin/csh/init.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint

bin/csh/lex.c

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

bin/csh/misc.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint

bin/csh/parse.c

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

bin/csh/pathnames.h

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ * $FreeBSD$
  */
 
 #define	_PATH_BIN		"/bin"

bin/csh/proc.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint

bin/csh/proc.h

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)proc.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ * $FreeBSD$
  */
 
 /*

bin/csh/sem.c

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

bin/csh/set.c

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

bin/csh/str.c

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

bin/csh/time.c

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

bin/date/Makefile

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	date
 SRCS=	date.c netdate.c

bin/date/date.1

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)date.1	8.2 (Berkeley) 11/17/93
-.\"	$Id: date.1,v 1.5 1995/04/03 20:08:32 joerg Exp $
+.\" $FreeBSD$
 .\"
 .Dd November 17, 1993
 .Dt DATE 1
@@ -127,7 +127,7 @@ Hour, a number from 0 to 23.
 .It Ar mm
 Minutes, a number from 0 to 59.
 .It Ar .ss
-Seconds, a number from 0 to 61 (59 plus a a maximum of two leap seconds).
+Seconds, a number from 0 to 61 (59 plus a maximum of two leap seconds).
 .El
 .Pp
 Everything but the minutes is optional.

bin/date/date.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: date.c,v 1.4 1995/04/03 20:08:33 joerg Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint

bin/date/extern.h

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ * $FreeBSD$
  */
 
 int	netsettime __P((time_t));

bin/date/netdate.c

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

bin/dd/Makefile

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	dd
 SRCS=	args.c conv.c conv_tab.c dd.c misc.c position.c

bin/dd/args.c

@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint

bin/dd/conv.c

@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint

bin/dd/conv_tab.c

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

bin/dd/dd.1

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dd.1	8.2 (Berkeley) 1/13/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd January 13, 1994
 .Dt DD 1

bin/dd/dd.c

@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: dd.c,v 1.3 1995/01/17 22:55:59 ache Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint

bin/dd/dd.h

@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dd.h	8.3 (Berkeley) 4/2/94
- *	$Id$
+ * $FreeBSD$
  */
 
 /* Input/output stream state. */

bin/dd/extern.h

@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.3 (Berkeley) 4/2/94
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <sys/cdefs.h>

bin/dd/misc.c

@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint

bin/dd/position.c

@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint

bin/df/Makefile

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/1/94
-#	$Id$
+# $FreeBSD$
 
 PROG=	df
 BINGRP=	operator

bin/df/df.1

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)df.1	8.2 (Berkeley) 1/13/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd January 13, 1994
 .Dt DF 1

bin/df/df.c

@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: df.c,v 1.6 1995/03/19 13:28:15 joerg Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
@@ -386,10 +386,7 @@ ufs_df(file, maxwidth)
 	sfsp->f_blocks = sblock.fs_dsize;
 	sfsp->f_bfree = sblock.fs_cstotal.cs_nbfree * sblock.fs_frag +
 		sblock.fs_cstotal.cs_nffree;
-	sfsp->f_bavail = (sblock.fs_dsize * (100 - sblock.fs_minfree) / 100) -
-		(sblock.fs_dsize - sfsp->f_bfree);
-	if (sfsp->f_bavail < 0)
-		sfsp->f_bavail = 0;
+	sfsp->f_bavail = freespace(&sblock, sblock.fs_minfree);
 	sfsp->f_files =  sblock.fs_ncg * sblock.fs_ipg;
 	sfsp->f_ffree = sblock.fs_cstotal.cs_nifree;
 	sfsp->f_fsid.val[0] = 0;

bin/domainname/Makefile

@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG=	domainname
 

bin/domainname/domainname.1

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

bin/domainname/domainname.c

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

bin/echo/Makefile

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	echo
 

bin/echo/echo.1

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)echo.1	8.1 (Berkeley) 7/22/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd July 22, 1993
 .Dt ECHO 1

bin/echo/echo.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint

bin/ed/Makefile

@@ -1,8 +1,15 @@
-#	$Id: Makefile,v 1.9 1994/10/29 10:13:34 phk Exp $
+# $FreeBSD$
 
 PROG=	ed
-SRCS=	 buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c
+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 exists(../../secure) && !defined(NOCRYPT) && !defined(NOSECURE)
+DISTRIBUTION=des
+CFLAGS+=-DDES
+LDADD+= -L${CIPHEROBJDIR} -lcipher
+DPADD+= ${CIPHEROBJDIR}/libcipher.a
+.endif
+
 .include <bsd.prog.mk>

bin/ed/POSIX

@@ -1,4 +1,4 @@
-$Id$
+$FreeBSD$
 
 This version of ed(1) is not strictly POSIX compliant, as described in
 the POSIX 1003.2 document.  The following is a summary of the omissions,

bin/ed/README

@@ -1,4 +1,4 @@
-$Id$
+$FreeBSD$
 
 ed is an 8-bit-clean, POSIX-compliant line editor.  It should work with
 any regular expression package that conforms to the POSIX interface

bin/ed/buf.c

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

bin/ed/cbc.c

@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)bdes.c	5.5 (Berkeley) 6/27/91
- *	$Id: cbc.c,v 1.4 1994/09/24 02:55:24 davidg Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint

bin/ed/ed.1

@@ -1,4 +1,4 @@
-.\"	$Id$
+.\" $FreeBSD$
 .TH ED 1 "21 May 1993"
 .SH NAME
 .\" ed, red \- text editor

bin/ed/ed.h

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

bin/ed/glbl.c

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

bin/ed/io.c

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

bin/ed/main.c

@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: main.c,v 1.4 1995/03/19 13:28:34 joerg Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint

bin/ed/re.c

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

bin/ed/sub.c

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

bin/ed/test/Makefile

@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 SHELL=	/bin/sh
 ED=	../obj/ed

bin/ed/undo.c

@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint

bin/expr/Makefile

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

bin/expr/expr.1

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

bin/expr/expr.y

@@ -4,7 +4,7 @@
  *
  * Largely rewritten by J.T. Conklin ([email protected])
  *
- * $Id: expr.y,v 1.9 1995/03/19 13:28:41 joerg Exp $
+ * $FreeBSD$
  */
 
 #include <stdio.h>
@@ -15,7 +15,7 @@
 #include <err.h>
   
 enum valtype {
-	integer, string
+	integer, numeric_string, string
 } ;
 
 struct val {
@@ -56,7 +56,6 @@ char **av;
 %left <val> '+' '-'
 %left <val> '*' '/' '%'
 %left <val> ':'
-%left UNARY
 
 %token <val> TOKEN
 %type <val> start expr
@@ -94,7 +93,7 @@ int i;
 
 	vp = (struct val *) malloc (sizeof (*vp));
 	if (vp == NULL) {
-		err (2, NULL);
+		errx (2, "malloc() failed");
 	}
 
 	vp->type = integer;
@@ -111,7 +110,7 @@ char *s;
 
 	vp = (struct val *) malloc (sizeof (*vp));
 	if (vp == NULL || ((vp->u.s = strdup (s)) == NULL)) {
-		err (2, NULL);
+		errx (2, "malloc() failed");
 	}
 
 	for(i = 1, isint = isdigit(s[0]) || s[0] == '-';
@@ -122,9 +121,10 @@ char *s;
 			 isint = 0;
 	}
 
-	vp->type = string;
-	if(isint)
-		to_integer(vp);
+	if (isint)
+		vp->type = numeric_string;
+	else	
+		vp->type = string;
 
 	return vp;
 }
@@ -134,7 +134,7 @@ void
 free_value (vp)
 struct val *vp;
 {
-	if (vp->type == string)
+	if (vp->type == string || vp->type == numeric_string)
 		free (vp->u.s);	
 }
 
@@ -143,34 +143,19 @@ int
 to_integer (vp)
 struct val *vp;
 {
-	char *s;
-	int neg;
 	int i;
 
 	if (vp->type == integer)
 		return 1;
 
-	s = vp->u.s;
-	i = 0;
-      
-	neg = (*s == '-');
-	if (neg)
-		s++;
-      
-	for (;*s; s++) {
-		if (!isdigit (*s)) 
-			return 0;
-      
-		i *= 10;
-		i += *s - '0';
-	}
+	if (vp->type == string)
+		return 0;
 
+	/* vp->type == numeric_string, make it numeric */
+	i  = atoi(vp->u.s);
 	free (vp->u.s);
-	if (neg) 
-		i *= -1;
-  
+	vp->u.i = i;
 	vp->type = integer;
-	vp->u.i  = i;
 	return 1;
 }
 
@@ -180,12 +165,12 @@ struct val *vp;
 {
 	char *tmp;
 
-	if (vp->type == string)
+	if (vp->type == string || vp->type == numeric_string)
 		return;
 
 	tmp = malloc (25);
 	if (tmp == NULL) {
-		err (2, NULL);
+		errx (2, "malloc() failed");
 	}
 
 	sprintf (tmp, "%d", vp->u.i);
@@ -198,6 +183,7 @@ int
 isstring (vp)
 struct val *vp;
 {
+	/* only TRUE if this string is not a valid integer */
 	return (vp->type == string);
 }
 
@@ -241,7 +227,7 @@ struct val *vp;
 
 int yyparse ();
 
-void
+int
 main (argc, argv)
 int argc;
 char **argv;
@@ -257,7 +243,7 @@ char **argv;
 	else
 		printf ("%s\n", result->u.s);
 
-	exit (is_zero_or_null (result));
+	return (is_zero_or_null (result));
 }
 
 int
@@ -306,6 +292,8 @@ struct val *a, *b;
 		to_string (b);	
 		r = make_integer (strcoll (a->u.s, b->u.s) == 0);
 	} else {
+		(void)to_integer(a);
+		(void)to_integer(b);
 		r = make_integer (a->u.i == b->u.i);
 	}
 
@@ -325,6 +313,8 @@ struct val *a, *b;
 		to_string (b);
 		r = make_integer (strcoll (a->u.s, b->u.s) > 0);
 	} else {
+		(void)to_integer(a);
+		(void)to_integer(b);
 		r= make_integer (a->u.i > b->u.i);
 	}
 
@@ -344,6 +334,8 @@ struct val *a, *b;
 		to_string (b);
 		r = make_integer (strcoll (a->u.s, b->u.s) < 0);
 	} else {
+		(void)to_integer(a);
+		(void)to_integer(b);
 		r = make_integer (a->u.i < b->u.i);
 	}
 
@@ -363,6 +355,8 @@ struct val *a, *b;
 		to_string (b);
 		r = make_integer (strcoll (a->u.s, b->u.s) >= 0);
 	} else {
+		(void)to_integer(a);
+		(void)to_integer(b);
 		r = make_integer (a->u.i >= b->u.i);
 	}
 
@@ -382,6 +376,8 @@ struct val *a, *b;
 		to_string (b);
 		r = make_integer (strcoll (a->u.s, b->u.s) <= 0);
 	} else {
+		(void)to_integer(a);
+		(void)to_integer(b);
 		r = make_integer (a->u.i <= b->u.i);
 	}
 
@@ -401,6 +397,8 @@ struct val *a, *b;
 		to_string (b);
 		r = make_integer (strcoll (a->u.s, b->u.s) != 0);
 	} else {
+		(void)to_integer(a);
+		(void)to_integer(b);
 		r = make_integer (a->u.i != b->u.i);
 	}
 

bin/hostname/Makefile

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	hostname
 

bin/hostname/hostname.1

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

bin/hostname/hostname.c

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint

bin/kill/Makefile

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	kill
 

bin/kill/kill.1

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)kill.1	8.1 (Berkeley) 5/31/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd May 31, 1993
 .Dt KILL 1

bin/kill/kill.c

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