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

MFC: change ifa_refcnt from short to int so that lots of cloned routes
from "default" don't overflow it.
2026-10-30 20:35:03 +01:00 · 2000-10-04 05:44:33 +00:00 · 2000-05-24 10:20:27 +00:00 · 2000-05-01 11:34:49 +00:00 · 2000-05-01 10:53:55 +00:00 · 1999-12-27 16:07:26 +00:00
4304 changed files with 89752 additions and 82431 deletions
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.57.4.16 1996/06/21 19:41:35 markm Exp $
+# $FreeBSD$
 #
 # Make command line options:
 #	-DCLOBBER will remove /usr/include and MOST of /usr/lib
@@ -216,17 +216,21 @@ 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
@@ -243,6 +247,9 @@ includes:
 	cd ${.CURDIR}/lib/libss &&		${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 "--------------------------------------------------------------"
@@ -288,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}
@@ -297,12 +310,6 @@ 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}
@@ -325,17 +332,13 @@ include-tools:

 build-tools:
 	@echo "--------------------------------------------------------------"
-	@echo " Rebuilding ${DESTDIR} C compiler, make, sgmlfmt, and zic(8)"
+	@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 && \
-		${MAKE} depend all install ${CLEANDIR} ${OBJDIR} 
 	cd ${.CURDIR}/gnu/usr.bin/groff && \
 		${MAKE} depend all install ${CLEANDIR} ${OBJDIR} 
 	cd ${.CURDIR}/usr.sbin/zic && \
@@ -1,4 +1,4 @@
-; $Id: TODO,v 1.12 1995/04/23 21:34:23 paul Exp $
+; $FreeBSD$

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

@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id: Makefile,v 1.2 1994/09/18 21:25:26 wollman Exp $
+# $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 \
@@ -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
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+# $FreeBSD$

 PROG=	cat

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)cat.1	8.1 (Berkeley) 6/29/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .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.
 *
- *	$Id: cat.c,v 1.3 1995/10/03 12:46:37 bde Exp $
+ * $FreeBSD$
 */

 #ifndef lint
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+# $FreeBSD$

 PROG=	chmod

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)chmod.1	8.4 (Berkeley) 3/31/94
-.\"	$Id: chmod.1,v 1.2 1994/09/24 02:53:37 davidg Exp $
+.\" $FreeBSD$
 .\"
 .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.
 *
- *	$Id: chmod.c,v 1.3 1995/02/03 22:21:09 bde Exp $
+ * $FreeBSD$
 */

 #ifndef lint
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+# $FreeBSD$

 PROG=	cp
 SRCS=	cp.c utils.c
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)cp.1	8.3 (Berkeley) 4/18/94
-.\"	$Id: cp.1,v 1.2 1994/09/24 02:53:40 davidg Exp $
+.\" $FreeBSD$
 .\"
 .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.
 *
- *	$Id: cp.c,v 1.6 1995/05/30 00:06:21 rgrimes Exp $
+ * $FreeBSD$
 */

 #ifndef lint
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 *
 *	@(#)extern.h	8.2 (Berkeley) 4/1/94
- *	$Id: extern.h,v 1.2 1994/09/24 02:53:41 davidg Exp $
+ * $FreeBSD$
 */

 typedef struct {
@@ -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.3.4.2 1995/10/05 07:24:24 davidg Exp $
+ * $FreeBSD$
 */

 #ifndef lint
@@ -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
@@ -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
@@ -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-%'
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.2	8.1 (Berkeley) 6/8/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .nr H1 1
 .NH
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.3	8.1 (Berkeley) 6/8/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .nr H1 2
 .NH
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.4	8.1 (Berkeley) 6/8/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .nr H1 3
 .NH
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.a	8.1 (Berkeley) 6/8/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .SH
 Appendix \- Special characters
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.g	8.1 (Berkeley) 6/8/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .SH
 Glossary
@@ -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
@@ -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
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id$
+ * $FreeBSD$
 */

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

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

 #ifndef lint
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)csh.1	8.2 (Berkeley) 1/21/94
-.\"	$Id: csh.1,v 1.3 1995/05/06 13:52:29 ache Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 21, 1994
 .Dt CSH 1
@@ -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.4.1 1995/08/25 02:55:47 davidg Exp $
+ * $FreeBSD$
 */

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

 /*
@@ -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
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 *
 *	@(#)dir.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ * $FreeBSD$
 */

 /*
@@ -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
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id$
+ * $FreeBSD$
 */

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

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

 #include <sys/cdefs.h>
@@ -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
@@ -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.3 1995/05/30 00:06:34 rgrimes Exp $
+ * $FreeBSD$
 */

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

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

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

 #ifndef lint
@@ -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
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 *
 *	@(#)pathnames.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ * $FreeBSD$
 */

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

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

 /*
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+# $FreeBSD$

 PROG=	date
 SRCS=	date.c netdate.c
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)date.1	8.2 (Berkeley) 11/17/93
-.\"	$Id: date.1,v 1.5.4.1 1995/08/28 10:33:04 davidg Exp $
+.\" $FreeBSD$
 .\"
 .Dd November 17, 1993
 .Dt DATE 1
@@ -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.4.1 1995/08/28 10:31:25 davidg Exp $
+ * $FreeBSD$
 */

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

 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.
 *
- *	$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);
@@ -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
@@ -34,7 +34,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id$
+ * $FreeBSD$
 */

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

 #ifndef lint
@@ -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
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dd.1	8.2 (Berkeley) 1/13/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .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.
 *
- *	$Id: dd.c,v 1.4 1995/01/17 23:04:29 ache Exp $
+ * $FreeBSD$
 */

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

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

 #include <sys/cdefs.h>
@@ -34,7 +34,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id$
+ * $FreeBSD$
 */

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

 #ifndef lint
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/1/94
-#	$Id$
+# $FreeBSD$

 PROG=	df
 BINGRP=	operator
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)df.1	8.2 (Berkeley) 1/13/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .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.
 *
- *	$Id: df.c,v 1.7.4.2 1996/06/05 02:35:24 jkh Exp $
+ * $FreeBSD$
 */

 #ifndef lint
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$

 PROG=	domainname

@@ -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
@@ -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>
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+# $FreeBSD$

 PROG=	echo

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)echo.1	8.1 (Berkeley) 7/22/93
-.\"	$Id: echo.1,v 1.2 1994/09/24 02:55:17 davidg Exp $
+.\" $FreeBSD$
 .\"
 .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.
 *
- *	$Id: echo.c,v 1.2 1994/09/24 02:55:18 davidg Exp $
+ * $FreeBSD$
 */

 #ifndef lint
@@ -1,8 +1,15 @@
-#	$Id: Makefile,v 1.10 1994/12/18 15:15:10 jkh 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>
@@ -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,
@@ -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
@@ -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";
@@ -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
@@ -1,4 +1,4 @@
-.\"	$Id$
+.\" $FreeBSD$
 .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
- *	$Id: ed.h,v 1.7 1994/09/24 02:55:25 davidg Exp $
+ * $FreeBSD$
 */

 #include <sys/types.h>
@@ -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
@@ -24,7 +24,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: io.c,v 1.4 1995/03/19 13:28:32 joerg Exp $
+ * $FreeBSD$
 */

 #ifndef lint
@@ -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
@@ -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
@@ -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
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$

 SHELL=	/bin/sh
 ED=	../obj/ed
@@ -24,7 +24,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id$
+ * $FreeBSD$
 */

 #ifndef lint
@@ -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.7 1995/05/30 00:06:49 rgrimes Exp $
+# $FreeBSD$

 PROG=		expr
 SRCS=		expr.c
@@ -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.3 1994/04/24 01:18:46 jkh Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 3, 1993
 .Dt EXPR 1
@@ -4,7 +4,7 @@
 *
 * Largely rewritten by J.T. Conklin ([email protected])
 *
- * $Id: expr.y,v 1.11 1995/11/18 18:05:03 joerg Exp $
+ * $FreeBSD$
 */

 #include <stdio.h>
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+# $FreeBSD$

 PROG=	hostname

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)hostname.1	8.1 (Berkeley) 5/31/93
-.\"	$Id: hostname.1,v 1.2.6.2 1996/06/05 02:35:38 jkh Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 31, 1993
 .Dt HOSTNAME 1
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id$
+ * $FreeBSD$
 */

 #ifndef lint
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+# $FreeBSD$

 PROG=	kill

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