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.18 1996/08/11 03:05:16 rgrimes Exp $
+# $FreeBSD$
 #
 # Make command line options:
 #	-DCLOBBER will remove /usr/include and MOST of /usr/lib
@@ -332,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 && \

TODO

@@ -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 `**'.
 

bin/Makefile

@@ -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 \

bin/Makefile.inc

@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 5/31/93
-#	$Id: Makefile.inc,v 1.7 1996/09/22 21:51:04 wosch Exp $
+# $FreeBSD$
 
 BINDIR?=	/bin
 NOSHARED?=	YES

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: chmod.1,v 1.2 1994/09/24 02:53:37 davidg Exp $
+.\" $FreeBSD$
 .\"
 .Dd March 31, 1994
 .Dt CHMOD 1

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: cp.1,v 1.2 1994/09/24 02:53:40 davidg Exp $
+.\" $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.6 1995/05/30 00:06:21 rgrimes Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint

bin/cp/extern.h

@@ -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 {

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.3.4.2 1995/10/05 07:24:24 davidg 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.3 1995/05/30 00:06:29 rgrimes 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.3 1995/05/06 13:52:29 ache 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.4.1 1995/08/25 02:55:47 davidg 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.3 1995/05/30 00:06:34 rgrimes 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.4.1 1995/08/28 10:33:04 davidg Exp $
+.\" $FreeBSD$
 .\"
 .Dd November 17, 1993
 .Dt DATE 1

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.4.1 1995/08/28 10:31:25 davidg 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.4 1995/01/17 23:04:29 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.7.4.2 1996/06/05 02:35:24 jkh Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint

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: echo.1,v 1.2 1994/09/24 02:55:17 davidg Exp $
+.\" $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: echo.c,v 1.2 1994/09/24 02:55:18 davidg Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint

bin/ed/Makefile

@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.13 1995/10/22 20:14:13 ache Exp $
+# $FreeBSD$
 
 PROG=	ed
 SRCS=	buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c

bin/ed/POSIX

@@ -1,4 +1,4 @@
-$Id$
+$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.4 1995/03/19 13:28:32 joerg 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.7 1995/05/30 00:06:49 rgrimes Exp $
+# $FreeBSD$
 
 PROG=		expr
 SRCS=		expr.c

bin/expr/expr.1

@@ -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

bin/expr/expr.y

@@ -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>

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: hostname.1,v 1.2.6.2 1996/06/05 02:35:38 jkh Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 31, 1993
 .Dt HOSTNAME 1

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