summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authormycroft <mycroft@NetBSD.org>1993-08-02 17:48:44 +0000
committermycroft <mycroft@NetBSD.org>1993-08-02 17:48:44 +0000
commitaee4b07b8a049bdc57cefcbb82bebeb6f341859a (patch)
treed2baf06176c4135542f5717a0fa9b45752f77e4f /usr.bin
parentc8194f0876b272d70833a6b91ec566314a02050a (diff)
Add RCS identifiers, remove some completely useless RCS logs and patchkit
headers, and a few other insignificant changes.
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/crontab/Makefile1
-rw-r--r--usr.bin/crontab/crontab.138
-rw-r--r--usr.bin/crontab/crontab.5.540
-rw-r--r--usr.bin/crontab/crontab.c34
-rw-r--r--usr.bin/elvis/Makefile1
-rw-r--r--usr.bin/elvis/blk.c4
-rw-r--r--usr.bin/elvis/cmd1.c4
-rw-r--r--usr.bin/elvis/cmd2.c4
-rw-r--r--usr.bin/elvis/config.h2
-rw-r--r--usr.bin/elvis/ctype.c5
-rw-r--r--usr.bin/elvis/ctype.h2
-rw-r--r--usr.bin/elvis/curses.c5
-rw-r--r--usr.bin/elvis/curses.h2
-rw-r--r--usr.bin/elvis/cut.c5
-rw-r--r--usr.bin/elvis/doc/Makefile2
-rw-r--r--usr.bin/elvis/elvis.11
-rw-r--r--usr.bin/elvis/ex.c5
-rw-r--r--usr.bin/elvis/input.c5
-rw-r--r--usr.bin/elvis/main.c5
-rw-r--r--usr.bin/elvis/misc.c5
-rw-r--r--usr.bin/elvis/modify.c5
-rw-r--r--usr.bin/elvis/move1.c5
-rw-r--r--usr.bin/elvis/move2.c5
-rw-r--r--usr.bin/elvis/move3.c5
-rw-r--r--usr.bin/elvis/move4.c5
-rw-r--r--usr.bin/elvis/move5.c5
-rw-r--r--usr.bin/elvis/opts.c5
-rw-r--r--usr.bin/elvis/prsvunix.c5
-rw-r--r--usr.bin/elvis/recycle.c5
-rw-r--r--usr.bin/elvis/redraw.c5
-rw-r--r--usr.bin/elvis/regexp.c5
-rw-r--r--usr.bin/elvis/regexp.h2
-rw-r--r--usr.bin/elvis/regsub.c5
-rw-r--r--usr.bin/elvis/system.c5
-rw-r--r--usr.bin/elvis/tio.c5
-rw-r--r--usr.bin/elvis/tmp.c4
-rw-r--r--usr.bin/elvis/unix.c5
-rw-r--r--usr.bin/elvis/vars.c5
-rw-r--r--usr.bin/elvis/vcmd.c4
-rw-r--r--usr.bin/elvis/vi.c4
-rw-r--r--usr.bin/elvis/vi.h2
-rw-r--r--usr.bin/elvisrecover/Makefile2
-rw-r--r--usr.bin/elvisrecover/elvisrecover.11
-rw-r--r--usr.bin/elvisrecover/elvisrecover.c4
-rw-r--r--usr.bin/file/Makefile2
-rw-r--r--usr.bin/getopt/Makefile3
-rw-r--r--usr.bin/getopt/getopt.11
-rw-r--r--usr.bin/getopt/getopt.c4
-rw-r--r--usr.bin/gprof/hp300.c4
-rw-r--r--usr.bin/gprof/i386.c4
-rw-r--r--usr.bin/m4/expr.c4
-rw-r--r--usr.bin/m4/extr.h2
-rw-r--r--usr.bin/m4/int2str.c4
-rw-r--r--usr.bin/m4/look.c4
-rw-r--r--usr.bin/m4/main.c4
-rw-r--r--usr.bin/m4/mdef.h2
-rw-r--r--usr.bin/m4/misc.c4
-rw-r--r--usr.bin/m4/ourlims.h2
-rw-r--r--usr.bin/m4/serv.c2
-rw-r--r--usr.bin/make/Makefile.dist2
-rw-r--r--usr.bin/make/lst.lib/Makefile.dist1
-rw-r--r--usr.bin/man/catman/Makefile4
-rw-r--r--usr.bin/man/catman/catman.84
-rw-r--r--usr.bin/man/catman/catman.c6
-rw-r--r--usr.bin/man/makewhatis/Makefile2
-rw-r--r--usr.bin/patch/EXTERN.h11
-rw-r--r--usr.bin/patch/INTERN.h11
-rw-r--r--usr.bin/patch/Makefile2
-rw-r--r--usr.bin/patch/backupfile.c4
-rw-r--r--usr.bin/patch/backupfile.h5
-rw-r--r--usr.bin/patch/common.h17
-rw-r--r--usr.bin/patch/config.h2
-rw-r--r--usr.bin/patch/inp.c16
-rw-r--r--usr.bin/patch/inp.h11
-rw-r--r--usr.bin/patch/patch.139
-rw-r--r--usr.bin/patch/patch.c91
-rw-r--r--usr.bin/patch/patchlevel.h2
-rw-r--r--usr.bin/patch/pch.c39
-rw-r--r--usr.bin/patch/pch.h14
-rw-r--r--usr.bin/patch/util.c4
-rw-r--r--usr.bin/patch/util.h11
-rw-r--r--usr.bin/patch/version.c13
-rw-r--r--usr.bin/patch/version.h11
-rw-r--r--usr.bin/ref/Makefile2
-rw-r--r--usr.bin/ref/ref.11
-rw-r--r--usr.bin/ref/ref.c5
-rw-r--r--usr.bin/rpcgen/Makefile1
-rw-r--r--usr.bin/rup/Makefile6
-rw-r--r--usr.bin/rup/rup.14
-rw-r--r--usr.bin/rup/rup.c4
-rw-r--r--usr.bin/rusers/Makefile6
-rw-r--r--usr.bin/rusers/rusers.c4
-rw-r--r--usr.bin/rwall/Makefile6
-rw-r--r--usr.bin/tn3270/Makefile2
-rw-r--r--usr.bin/tn3270/Makefile.inc2
-rw-r--r--usr.bin/tn3270/mset/Makefile2
-rw-r--r--usr.bin/tn3270/tn3270/Makefile2
-rw-r--r--usr.bin/tn3270/tools/Makefile2
-rw-r--r--usr.bin/tn3270/tools/mkastods/Makefile2
-rw-r--r--usr.bin/tn3270/tools/mkastosc/Makefile2
-rw-r--r--usr.bin/tn3270/tools/mkdctype/Makefile2
-rw-r--r--usr.bin/tn3270/tools/mkdstoas/Makefile2
-rw-r--r--usr.bin/tn3270/tools/mkhits/Makefile2
-rw-r--r--usr.bin/uname/uname.c7
-rw-r--r--usr.bin/yacc/closure.c4
-rw-r--r--usr.bin/yacc/defs.h2
-rw-r--r--usr.bin/yacc/error.c4
-rw-r--r--usr.bin/yacc/lalr.c4
-rw-r--r--usr.bin/yacc/lr0.c3
-rw-r--r--usr.bin/yacc/main.c4
-rw-r--r--usr.bin/yacc/mkpar.c3
-rw-r--r--usr.bin/yacc/output.c4
-rw-r--r--usr.bin/yacc/reader.c4
-rw-r--r--usr.bin/yacc/symtab.c5
-rw-r--r--usr.bin/yacc/verbose.c3
-rw-r--r--usr.bin/yacc/warshall.c4
-rw-r--r--usr.bin/yacc/yacc.13
117 files changed, 380 insertions, 374 deletions
diff --git a/usr.bin/crontab/Makefile b/usr.bin/crontab/Makefile
index 6a1c6231313..020bdfa2813 100644
--- a/usr.bin/crontab/Makefile
+++ b/usr.bin/crontab/Makefile
@@ -1,3 +1,4 @@
+# $Id: Makefile,v 1.5 1993/08/02 17:53:21 mycroft Exp $
PROG= crontab
SRCS= crontab.c misc.c entry.c env.c
diff --git a/usr.bin/crontab/crontab.1 b/usr.bin/crontab/crontab.1
index 29804f27610..7aa8bdf7a86 100644
--- a/usr.bin/crontab/crontab.1
+++ b/usr.bin/crontab/crontab.1
@@ -1,22 +1,24 @@
-.\" $Header: /cvsroot/src/usr.bin/crontab/Attic/crontab.1,v 1.2 1993/05/28 08:34:31 cgd Exp $
+.\" -*- nroff -*-
+.\"
+.\" Copyright 1988,1990 by Paul Vixie
+.\" All rights reserved
+.\"
+.\" Distribute freely, except: don't remove my name from the source or
+.\" documentation (don't take credit for my work), mark your changes (don't
+.\" get me blamed for your possible bugs), don't alter or remove this
+.\" notice. May be sold if buildable source is provided to buyer. No
+.\" warrantee of any kind, express or implied, is included with this
+.\" software; use at your own risk, responsibility for damages (if any) to
+.\" anyone resulting from the use of this software rests entirely with the
+.\" user.
+.\"
+.\" Send bug reports, bug fixes, enhancements, requests, flames, etc., and
+.\" I'll try to keep a version up to date. I can be reached as follows:
+.\" Paul Vixie, 329 Noe Street, San Francisco, CA, 94114, (415) 864-7013,
+.\" paul@vixie.sf.ca.us || {hoptoad,pacbell,decwrl,crash}!vixie!paul
+.\"
+.\" $Id: crontab.1,v 1.3 1993/08/02 17:53:22 mycroft Exp $
.\"
-.\"/* Copyright 1988,1990 by Paul Vixie
-.\" * All rights reserved
-.\" *
-.\" * Distribute freely, except: don't remove my name from the source or
-.\" * documentation (don't take credit for my work), mark your changes (don't
-.\" * get me blamed for your possible bugs), don't alter or remove this
-.\" * notice. May be sold if buildable source is provided to buyer. No
-.\" * warrantee of any kind, express or implied, is included with this
-.\" * software; use at your own risk, responsibility for damages (if any) to
-.\" * anyone resulting from the use of this software rests entirely with the
-.\" * user.
-.\" *
-.\" * Send bug reports, bug fixes, enhancements, requests, flames, etc., and
-.\" * I'll try to keep a version up to date. I can be reached as follows:
-.\" * Paul Vixie, 329 Noe Street, San Francisco, CA, 94114, (415) 864-7013,
-.\" * paul@vixie.sf.ca.us || {hoptoad,pacbell,decwrl,crash}!vixie!paul
-.\" */
.TH CRONTAB 1 "9 December 1988"
.UC 4
.SH NAME
diff --git a/usr.bin/crontab/crontab.5.5 b/usr.bin/crontab/crontab.5.5
index 794e9b4c941..0d4b1f297cc 100644
--- a/usr.bin/crontab/crontab.5.5
+++ b/usr.bin/crontab/crontab.5.5
@@ -1,22 +1,24 @@
-.\" $Header: /cvsroot/src/usr.bin/crontab/Attic/crontab.5.5,v 1.2 1993/05/28 08:34:32 cgd Exp $
-.\"
-.\"/* Copyright 1988,1990 by Paul Vixie
-.\" * All rights reserved
-.\" *
-.\" * Distribute freely, except: don't remove my name from the source or
-.\" * documentation (don't take credit for my work), mark your changes (don't
-.\" * get me blamed for your possible bugs), don't alter or remove this
-.\" * notice. May be sold if buildable source is provided to buyer. No
-.\" * warrantee of any kind, express or implied, is included with this
-.\" * software; use at your own risk, responsibility for damages (if any) to
-.\" * anyone resulting from the use of this software rests entirely with the
-.\" * user.
-.\" *
-.\" * Send bug reports, bug fixes, enhancements, requests, flames, etc., and
-.\" * I'll try to keep a version up to date. I can be reached as follows:
-.\" * Paul Vixie, 329 Noe Street, San Francisco, CA, 94114, (415) 864-7013,
-.\" * paul@vixie.sf.ca.us || {hoptoad,pacbell,decwrl,crash}!vixie!paul
-.\" */
+.\" -*- nroff -*-
+.\"
+.\" Copyright 1988,1990 by Paul Vixie
+.\" All rights reserved
+.\"
+.\" Distribute freely, except: don't remove my name from the source or
+.\" documentation (don't take credit for my work), mark your changes (don't
+.\" get me blamed for your possible bugs), don't alter or remove this
+.\" notice. May be sold if buildable source is provided to buyer. No
+.\" warrantee of any kind, express or implied, is included with this
+.\" software; use at your own risk, responsibility for damages (if any) to
+.\" anyone resulting from the use of this software rests entirely with the
+.\" user.
+.\"
+.\" Send bug reports, bug fixes, enhancements, requests, flames, etc., and
+.\" I'll try to keep a version up to date. I can be reached as follows:
+.\" Paul Vixie, 329 Noe Street, San Francisco, CA, 94114, (415) 864-7013,
+.\" paul@vixie.sf.ca.us || {hoptoad,pacbell,decwrl,crash}!vixie!paul
+.\"
+.\" $Id: crontab.5.5,v 1.3 1993/08/02 17:53:23 mycroft Exp $
+.\"
.TH CRONTAB 5 "15 January 1990"
.UC 4
.SH NAME
diff --git a/usr.bin/crontab/crontab.c b/usr.bin/crontab/crontab.c
index 99bab38ca70..44482aee351 100644
--- a/usr.bin/crontab/crontab.c
+++ b/usr.bin/crontab/crontab.c
@@ -1,34 +1,6 @@
-#if !defined(lint) && !defined(LINT)
-static char rcsid[] = "$Header: /cvsroot/src/usr.bin/crontab/Attic/crontab.c,v 1.3 1993/05/28 08:34:33 cgd Exp $";
-#endif
-
-/* Revision 1.5 87/05/02 17:33:22 paul
- * pokecron? (RCS file has the rest of the log)
- *
- * Revision 1.5 87/05/02 17:33:22 paul
- * baseline for mod.sources release
- *
- * Revision 1.4 87/03/31 13:11:48 paul
- * I won't say that rs@mirror gave me this idea but crontab uses getopt() now
- *
- * Revision 1.3 87/03/30 23:43:48 paul
- * another suggestion from rs@mirror:
- * use getpwuid(getuid)->pw_name instead of getenv("USER")
- * this is a boost to security...
- *
- * Revision 1.2 87/02/11 17:40:12 paul
- * changed command syntax to allow append and replace instead of append as
- * default and no replace at all.
- *
- * Revision 1.1 87/01/26 23:49:06 paul
- * Initial revision
- */
-
-/*
- * ++COPYRIGHT++
- * --COPYRIGHT--
- */
-
+#ifndef lint
+static char rcsid[] = "$Id: crontab.c,v 1.4 1993/08/02 17:53:24 mycroft Exp $";
+#endif /* not lint */
#define MAIN_PROGRAM
diff --git a/usr.bin/elvis/Makefile b/usr.bin/elvis/Makefile
index 53f210c1ef7..1b72ef5f8df 100644
--- a/usr.bin/elvis/Makefile
+++ b/usr.bin/elvis/Makefile
@@ -1,3 +1,4 @@
+# $Id: Makefile,v 1.3 1993/08/02 17:53:41 mycroft Exp $
CFLAGS += -DBSD
DPADD= ${LIBTERM}
diff --git a/usr.bin/elvis/blk.c b/usr.bin/elvis/blk.c
index 091962dab7a..6ce7285d07f 100644
--- a/usr.bin/elvis/blk.c
+++ b/usr.bin/elvis/blk.c
@@ -12,6 +12,10 @@
* It also contains the "do" and "undo" functions.
*/
+#ifndef lint
+static char rcsid[] = "$Id: blk.c,v 1.3 1993/08/02 17:53:42 mycroft Exp $";
+#endif /* not lint */
+
#include "config.h"
#include "vi.h"
diff --git a/usr.bin/elvis/cmd1.c b/usr.bin/elvis/cmd1.c
index 406cd7fe45c..68e84328f79 100644
--- a/usr.bin/elvis/cmd1.c
+++ b/usr.bin/elvis/cmd1.c
@@ -12,6 +12,10 @@
* files, options, etc. -- anything except text.
*/
+#ifndef lint
+static char rcsid[] = "$Id: cmd1.c,v 1.3 1993/08/02 17:53:43 mycroft Exp $";
+#endif /* not lint */
+
#include "config.h"
#include "ctype.h"
#include "vi.h"
diff --git a/usr.bin/elvis/cmd2.c b/usr.bin/elvis/cmd2.c
index 25bf69a8e50..9ad97a0c5b7 100644
--- a/usr.bin/elvis/cmd2.c
+++ b/usr.bin/elvis/cmd2.c
@@ -10,6 +10,10 @@
/* This file contains some of the commands - mostly ones that change text */
+#ifndef lint
+static char rcsid[] = "$Id: cmd2.c,v 1.3 1993/08/02 17:53:45 mycroft Exp $";
+#endif /* not lint */
+
#include "config.h"
#include "ctype.h"
#include "vi.h"
diff --git a/usr.bin/elvis/config.h b/usr.bin/elvis/config.h
index 9ad48e80b22..286c7588b67 100644
--- a/usr.bin/elvis/config.h
+++ b/usr.bin/elvis/config.h
@@ -2,6 +2,8 @@
* vi configuration file
* We try to automatically configure to various compilers and operating
* systems. Extend the autoconf section as needed.
+ *
+ * $Id: config.h,v 1.3 1993/08/02 17:53:46 mycroft Exp $
*/
#ifndef _CONFIG_H
diff --git a/usr.bin/elvis/ctype.c b/usr.bin/elvis/ctype.c
index fa0a7ba23ad..be3dbe70eff 100644
--- a/usr.bin/elvis/ctype.c
+++ b/usr.bin/elvis/ctype.c
@@ -4,6 +4,11 @@
* version of <ctype.h>. It should be portable.
*/
+#ifndef lint
+static char rcsid[] = "$Id: ctype.c,v 1.3 1993/08/02 17:53:46 mycroft Exp $";
+#endif /* not lint */
+
+
#include "config.h"
#include "ctype.h"
diff --git a/usr.bin/elvis/ctype.h b/usr.bin/elvis/ctype.h
index 1a46fd379b3..df0512b0c36 100644
--- a/usr.bin/elvis/ctype.h
+++ b/usr.bin/elvis/ctype.h
@@ -7,6 +7,8 @@
* This file uses the "uchar" data type and "UCHAR" conversion macro which
* are defined in "config.h". Consequently, any file that includes this
* header must include config.h first.
+ *
+ * $Id: ctype.h,v 1.2 1993/08/02 17:53:48 mycroft Exp $
*/
#ifndef _CT_UPPER
diff --git a/usr.bin/elvis/curses.c b/usr.bin/elvis/curses.c
index 063b0914b3d..5c0ca19aad4 100644
--- a/usr.bin/elvis/curses.c
+++ b/usr.bin/elvis/curses.c
@@ -14,6 +14,11 @@
* functions, limited compatibility with full curses, and only stdscr.
*/
+#ifndef lint
+static char rcsid[] = "$Id: curses.c,v 1.3 1993/08/02 17:53:49 mycroft Exp $";
+#endif /* not lint */
+
+
#include "config.h"
#include "vi.h"
diff --git a/usr.bin/elvis/curses.h b/usr.bin/elvis/curses.h
index 84c897cf738..ec8e158c58c 100644
--- a/usr.bin/elvis/curses.h
+++ b/usr.bin/elvis/curses.h
@@ -5,6 +5,8 @@
* 14407 SW Teal Blvd. #C
* Beaverton, OR 97005
* kirkenda@cs.pdx.edu
+ *
+ * $Id: curses.h,v 1.2 1993/08/02 17:53:50 mycroft Exp $
*/
diff --git a/usr.bin/elvis/cut.c b/usr.bin/elvis/cut.c
index cfa032160c3..e0fa6add664 100644
--- a/usr.bin/elvis/cut.c
+++ b/usr.bin/elvis/cut.c
@@ -10,6 +10,11 @@
/* This file contains function which manipulate the cut buffers. */
+#ifndef lint
+static char rcsid[] = "$Id: cut.c,v 1.3 1993/08/02 17:53:51 mycroft Exp $";
+#endif /* not lint */
+
+
#include "config.h"
#include "vi.h"
#if TURBOC
diff --git a/usr.bin/elvis/doc/Makefile b/usr.bin/elvis/doc/Makefile
index d0802dc13c0..863cde93ed6 100644
--- a/usr.bin/elvis/doc/Makefile
+++ b/usr.bin/elvis/doc/Makefile
@@ -1,3 +1,5 @@
+# $Id: Makefile,v 1.2 1993/08/02 17:53:27 mycroft Exp $
+
NROFF= nroff
HPROFF= troff
HPDEST= >/dev/hp
diff --git a/usr.bin/elvis/elvis.1 b/usr.bin/elvis/elvis.1
index 8d10b78a44d..be5c821e559 100644
--- a/usr.bin/elvis/elvis.1
+++ b/usr.bin/elvis/elvis.1
@@ -1,3 +1,4 @@
+.\" $Id: elvis.1,v 1.3 1993/08/02 17:53:52 mycroft Exp $ -*- nroff -*-
.TH ELVIS 1
.SH NAME
elvis, ex, vi, view, input - The editor
diff --git a/usr.bin/elvis/ex.c b/usr.bin/elvis/ex.c
index eda5f1139f2..87e714c1f8e 100644
--- a/usr.bin/elvis/ex.c
+++ b/usr.bin/elvis/ex.c
@@ -10,6 +10,11 @@
/* This file contains the code for reading ex commands. */
+#ifndef lint
+static char rcsid[] = "$Id: ex.c,v 1.4 1993/08/02 17:53:53 mycroft Exp $";
+#endif /* not lint */
+
+
#include "config.h"
#include "ctype.h"
#include "vi.h"
diff --git a/usr.bin/elvis/input.c b/usr.bin/elvis/input.c
index ca5b11581b9..3a4461acb22 100644
--- a/usr.bin/elvis/input.c
+++ b/usr.bin/elvis/input.c
@@ -12,6 +12,11 @@
* It also contains the code that supports digraphs.
*/
+#ifndef lint
+static char rcsid[] = "$Id: input.c,v 1.3 1993/08/02 17:53:54 mycroft Exp $";
+#endif /* not lint */
+
+
#include "config.h"
#include "ctype.h"
#include "vi.h"
diff --git a/usr.bin/elvis/main.c b/usr.bin/elvis/main.c
index f93f780225c..c90f1291797 100644
--- a/usr.bin/elvis/main.c
+++ b/usr.bin/elvis/main.c
@@ -10,6 +10,11 @@
/* This file contains the main() function of vi */
+#ifndef lint
+static char rcsid[] = "$Id: main.c,v 1.3 1993/08/02 17:53:55 mycroft Exp $";
+#endif /* not lint */
+
+
/* HACK! bcc needs to disable use of precompiled headers for this file,
or else command line args will not be passed to elvis */
#if __BORLANDC__
diff --git a/usr.bin/elvis/misc.c b/usr.bin/elvis/misc.c
index c9e0f689d21..426e3e5c90d 100644
--- a/usr.bin/elvis/misc.c
+++ b/usr.bin/elvis/misc.c
@@ -10,6 +10,11 @@
/* This file contains functions which didn't seem happy anywhere else */
+#ifndef lint
+static char rcsid[] = "$Id: misc.c,v 1.2 1993/08/02 17:53:56 mycroft Exp $";
+#endif /* not lint */
+
+
#include "config.h"
#include "vi.h"
diff --git a/usr.bin/elvis/modify.c b/usr.bin/elvis/modify.c
index 79b910366e9..78c3d34adc1 100644
--- a/usr.bin/elvis/modify.c
+++ b/usr.bin/elvis/modify.c
@@ -6,6 +6,11 @@
* change(frommark, tomark, text) - delete, then add
*/
+#ifndef lint
+static char rcsid[] = "$Id: modify.c,v 1.3 1993/08/02 17:53:57 mycroft Exp $";
+#endif /* not lint */
+
+
#include "config.h"
#include "vi.h"
diff --git a/usr.bin/elvis/move1.c b/usr.bin/elvis/move1.c
index 604b83d963d..79213dfe3be 100644
--- a/usr.bin/elvis/move1.c
+++ b/usr.bin/elvis/move1.c
@@ -10,6 +10,11 @@
/* This file contains most movement functions */
+#ifndef lint
+static char rcsid[] = "$Id: move1.c,v 1.3 1993/08/02 17:53:58 mycroft Exp $";
+#endif /* not lint */
+
+
#include "config.h"
#include "vi.h"
#include "ctype.h"
diff --git a/usr.bin/elvis/move2.c b/usr.bin/elvis/move2.c
index 999274e4b5a..cfe14954f81 100644
--- a/usr.bin/elvis/move2.c
+++ b/usr.bin/elvis/move2.c
@@ -10,6 +10,11 @@
/* This function contains the movement functions that perform RE searching */
+#ifndef lint
+static char rcsid[] = "$Id: move2.c,v 1.3 1993/08/02 17:53:59 mycroft Exp $";
+#endif /* not lint */
+
+
#include "config.h"
#include "vi.h"
#include "regexp.h"
diff --git a/usr.bin/elvis/move3.c b/usr.bin/elvis/move3.c
index 69949eed361..b5b9f7bad25 100644
--- a/usr.bin/elvis/move3.c
+++ b/usr.bin/elvis/move3.c
@@ -10,6 +10,11 @@
/* This file contains movement functions that perform character searches */
+#ifndef lint
+static char rcsid[] = "$Id: move3.c,v 1.3 1993/08/02 17:53:59 mycroft Exp $";
+#endif /* not lint */
+
+
#include "config.h"
#include "vi.h"
diff --git a/usr.bin/elvis/move4.c b/usr.bin/elvis/move4.c
index d42082d653a..eb86d2f67ab 100644
--- a/usr.bin/elvis/move4.c
+++ b/usr.bin/elvis/move4.c
@@ -10,6 +10,11 @@
/* This file contains movement functions which are screen-relative */
+#ifndef lint
+static char rcsid[] = "$Id: move4.c,v 1.3 1993/08/02 17:54:00 mycroft Exp $";
+#endif /* not lint */
+
+
#include "config.h"
#include "vi.h"
diff --git a/usr.bin/elvis/move5.c b/usr.bin/elvis/move5.c
index 408bac379cd..e32b9da99aa 100644
--- a/usr.bin/elvis/move5.c
+++ b/usr.bin/elvis/move5.c
@@ -10,6 +10,11 @@
/* This file contains the word-oriented movement functions */
+#ifndef lint
+static char rcsid[] = "$Id: move5.c,v 1.3 1993/08/02 17:54:01 mycroft Exp $";
+#endif /* not lint */
+
+
#include "config.h"
#include "ctype.h"
#include "vi.h"
diff --git a/usr.bin/elvis/opts.c b/usr.bin/elvis/opts.c
index 0d2d8d63f6f..f14c931455f 100644
--- a/usr.bin/elvis/opts.c
+++ b/usr.bin/elvis/opts.c
@@ -12,6 +12,11 @@
* values that can be modified via the "set" command.
*/
+#ifndef lint
+static char rcsid[] = "$Id: opts.c,v 1.3 1993/08/02 17:54:02 mycroft Exp $";
+#endif /* not lint */
+
+
#include "config.h"
#include "vi.h"
#include "ctype.h"
diff --git a/usr.bin/elvis/prsvunix.c b/usr.bin/elvis/prsvunix.c
index e03e0775269..ac8dba33042 100644
--- a/usr.bin/elvis/prsvunix.c
+++ b/usr.bin/elvis/prsvunix.c
@@ -2,6 +2,11 @@
/* This file contains the UNIX-specific parts of the "elvprsv" program. */
+#ifndef lint
+static char rcsid[] = "$Id: prsvunix.c,v 1.2 1993/08/02 17:54:03 mycroft Exp $";
+#endif /* not lint */
+
+
#if OSK
#define ELVPRSV
#include "osk.c"
diff --git a/usr.bin/elvis/recycle.c b/usr.bin/elvis/recycle.c
index c3a2a8fa4ad..eea599d24c1 100644
--- a/usr.bin/elvis/recycle.c
+++ b/usr.bin/elvis/recycle.c
@@ -12,6 +12,11 @@
* reusable blocks.
*/
+#ifndef lint
+static char rcsid[] = "$Id: recycle.c,v 1.3 1993/08/02 17:54:04 mycroft Exp $";
+#endif /* not lint */
+
+
#include "config.h"
#include "vi.h"
diff --git a/usr.bin/elvis/redraw.c b/usr.bin/elvis/redraw.c
index 358eaec7fcf..3521a2f620b 100644
--- a/usr.bin/elvis/redraw.c
+++ b/usr.bin/elvis/redraw.c
@@ -17,6 +17,11 @@
* idx2col() - converts a markidx() value to a logical column number.
*/
+#ifndef lint
+static char rcsid[] = "$Id: redraw.c,v 1.3 1993/08/02 17:54:04 mycroft Exp $";
+#endif /* not lint */
+
+
#include "config.h"
#include "vi.h"
#ifdef CRUNCH
diff --git a/usr.bin/elvis/regexp.c b/usr.bin/elvis/regexp.c
index 96cce7f8b85..0466e5daa99 100644
--- a/usr.bin/elvis/regexp.c
+++ b/usr.bin/elvis/regexp.c
@@ -29,6 +29,11 @@
* That right, this file contains TWO versions of the code.
*/
+#ifndef lint
+static char rcsid[] = "$Id: regexp.c,v 1.3 1993/08/02 17:54:06 mycroft Exp $";
+#endif /* not lint */
+
+
#include <setjmp.h>
#include "config.h"
#include "ctype.h"
diff --git a/usr.bin/elvis/regexp.h b/usr.bin/elvis/regexp.h
index 6d043b027d0..ed15c746bf2 100644
--- a/usr.bin/elvis/regexp.h
+++ b/usr.bin/elvis/regexp.h
@@ -3,6 +3,8 @@
*
* Caveat: this is V8 regexp(3) [actually, a reimplementation thereof],
* not the System V one.
+ *
+ * $Id: regexp.h,v 1.2 1993/08/02 17:54:07 mycroft Exp $
*/
#define NSUBEXP 10
diff --git a/usr.bin/elvis/regsub.c b/usr.bin/elvis/regsub.c
index 65592b30bd3..db2920910c9 100644
--- a/usr.bin/elvis/regsub.c
+++ b/usr.bin/elvis/regsub.c
@@ -4,6 +4,11 @@
* after a regexp match has been found.
*/
+#ifndef lint
+static char rcsid[] = "$Id: regsub.c,v 1.3 1993/08/02 17:54:07 mycroft Exp $";
+#endif /* not lint */
+
+
#include "config.h"
#include "ctype.h"
#include "vi.h"
diff --git a/usr.bin/elvis/system.c b/usr.bin/elvis/system.c
index 1d7b7db6200..43ed29c386c 100644
--- a/usr.bin/elvis/system.c
+++ b/usr.bin/elvis/system.c
@@ -20,6 +20,11 @@
* and any O.S./Compiler combination which adheres to UNIX forking conventions.
*/
+#ifndef lint
+static char rcsid[] = "$Id: system.c,v 1.3 1993/08/02 17:54:08 mycroft Exp $";
+#endif /* not lint */
+
+
#include "config.h"
#include "vi.h"
#ifndef XDOS
diff --git a/usr.bin/elvis/tio.c b/usr.bin/elvis/tio.c
index 56b0e9370fb..503b3b975bf 100644
--- a/usr.bin/elvis/tio.c
+++ b/usr.bin/elvis/tio.c
@@ -10,6 +10,11 @@
/* This file contains terminal I/O functions */
+#ifndef lint
+static char rcsid[] = "$Id: tio.c,v 1.3 1993/08/02 17:54:10 mycroft Exp $";
+#endif /* not lint */
+
+
#include "config.h"
#include "vi.h"
#include "ctype.h"
diff --git a/usr.bin/elvis/tmp.c b/usr.bin/elvis/tmp.c
index 46d29ec81da..5c3ce09f242 100644
--- a/usr.bin/elvis/tmp.c
+++ b/usr.bin/elvis/tmp.c
@@ -10,6 +10,10 @@
/* This file contains functions which create & readback a TMPFILE */
+#ifndef lint
+static char rcsid[] = "$Id: tmp.c,v 1.4 1993/08/02 17:54:11 mycroft Exp $";
+#endif /* not lint */
+
#include "config.h"
#include "vi.h"
diff --git a/usr.bin/elvis/unix.c b/usr.bin/elvis/unix.c
index f25b60afebf..7e403d37b09 100644
--- a/usr.bin/elvis/unix.c
+++ b/usr.bin/elvis/unix.c
@@ -13,6 +13,11 @@
* BSD, SysV, and V7 all need quite different implementations.
*/
+#ifndef lint
+static char rcsid[] = "$Id: unix.c,v 1.3 1993/08/02 17:54:12 mycroft Exp $";
+#endif /* not lint */
+
+
#include "config.h"
#if ANY_UNIX
# include "vi.h"
diff --git a/usr.bin/elvis/vars.c b/usr.bin/elvis/vars.c
index b009df4a5f5..bd609fd945b 100644
--- a/usr.bin/elvis/vars.c
+++ b/usr.bin/elvis/vars.c
@@ -10,6 +10,11 @@
/* This file contains variables which weren't happy anyplace else */
+#ifndef lint
+static char rcsid[] = "$Id: vars.c,v 1.3 1993/08/02 17:54:12 mycroft Exp $";
+#endif /* not lint */
+
+
#include "config.h"
#include "vi.h"
diff --git a/usr.bin/elvis/vcmd.c b/usr.bin/elvis/vcmd.c
index 4fd09238042..7732adc3863 100644
--- a/usr.bin/elvis/vcmd.c
+++ b/usr.bin/elvis/vcmd.c
@@ -10,6 +10,10 @@
/* This file contains the functions that handle VI commands */
+#ifndef lint
+static char rcsid[] = "$Id: vcmd.c,v 1.3 1993/08/02 17:54:13 mycroft Exp $";
+#endif /* not lint */
+
#include "config.h"
#include "ctype.h"
diff --git a/usr.bin/elvis/vi.c b/usr.bin/elvis/vi.c
index 2c4648f4619..f7fcb061f7e 100644
--- a/usr.bin/elvis/vi.c
+++ b/usr.bin/elvis/vi.c
@@ -6,6 +6,10 @@
* kirkenda@cs.pdx.edu
*/
+#ifndef lint
+static char rcsid[] = "$Id: vi.c,v 1.3 1993/08/02 17:54:14 mycroft Exp $";
+#endif /* not lint */
+
#include "config.h"
#include "ctype.h"
diff --git a/usr.bin/elvis/vi.h b/usr.bin/elvis/vi.h
index ce624a2c656..e0952ccc2fa 100644
--- a/usr.bin/elvis/vi.h
+++ b/usr.bin/elvis/vi.h
@@ -5,6 +5,8 @@
* 14407 SW Teal Blvd. #C
* Beaverton, OR 97005
* kirkenda@cs.pdx.edu
+ *
+ * $Id: vi.h,v 1.3 1993/08/02 17:54:15 mycroft Exp $
*/
#define VERSION "ELVIS 1.7, by Steve Kirkendall (30 December 1992)"
diff --git a/usr.bin/elvisrecover/Makefile b/usr.bin/elvisrecover/Makefile
index fbe5a7ce842..55b55139096 100644
--- a/usr.bin/elvisrecover/Makefile
+++ b/usr.bin/elvisrecover/Makefile
@@ -1,6 +1,6 @@
+# $Id: Makefile,v 1.3 1993/08/02 17:54:19 mycroft Exp $
PROG= elvisrecover
-#SRCS= elvisrecover.c
CFLAGS+=-I${.CURDIR}/../elvis
.include <bsd.prog.mk>
diff --git a/usr.bin/elvisrecover/elvisrecover.1 b/usr.bin/elvisrecover/elvisrecover.1
index b541c2ed14d..b0a18461a1a 100644
--- a/usr.bin/elvisrecover/elvisrecover.1
+++ b/usr.bin/elvisrecover/elvisrecover.1
@@ -1,3 +1,4 @@
+.\" $Id: elvisrecover.1,v 1.4 1993/08/02 17:54:20 mycroft Exp $ -*- nroff -*-
.TH ELVREC 1
.SH NAME
elvrec - Recover the modified version of a file after a crash
diff --git a/usr.bin/elvisrecover/elvisrecover.c b/usr.bin/elvisrecover/elvisrecover.c
index e4d7159439f..2f604e79660 100644
--- a/usr.bin/elvisrecover/elvisrecover.c
+++ b/usr.bin/elvisrecover/elvisrecover.c
@@ -9,6 +9,10 @@
* kirkenda@cs.pdx.edu
*/
+#ifndef lint
+static char rcsid[] = "$Id: elvisrecover.c,v 1.3 1993/08/02 17:54:21 mycroft Exp $";
+#endif /* not lint */
+
#include <stdio.h>
#include "config.h"
diff --git a/usr.bin/file/Makefile b/usr.bin/file/Makefile
index 07699c50d4f..419fa64edc3 100644
--- a/usr.bin/file/Makefile
+++ b/usr.bin/file/Makefile
@@ -1,3 +1,5 @@
+# $Id: Makefile,v 1.4 1993/08/02 17:54:24 mycroft Exp $
+
MAGIC= /etc/magic
MAGICOWN= bin
MAGICGRP= bin
diff --git a/usr.bin/getopt/Makefile b/usr.bin/getopt/Makefile
index ff1433af58c..b7b33c8efef 100644
--- a/usr.bin/getopt/Makefile
+++ b/usr.bin/getopt/Makefile
@@ -1,5 +1,4 @@
-# $Header: /cvsroot/src/usr.bin/getopt/Makefile,v 1.1 1993/06/21 12:43:58 brezak Exp $
-#
+# $Id: Makefile,v 1.2 1993/08/02 17:54:27 mycroft Exp $
PROG = getopt
MAN1 = getopt.0
diff --git a/usr.bin/getopt/getopt.1 b/usr.bin/getopt/getopt.1
index 16a50f090a5..593944e935b 100644
--- a/usr.bin/getopt/getopt.1
+++ b/usr.bin/getopt/getopt.1
@@ -1,3 +1,4 @@
+.\" $Id: getopt.1,v 1.3 1993/08/02 17:54:28 mycroft Exp $ -*- nroff -*-
.Dd June 21, 1993
.Dt GETOPT 1
.Os
diff --git a/usr.bin/getopt/getopt.c b/usr.bin/getopt/getopt.c
index 03b0987ef14..32afad132fa 100644
--- a/usr.bin/getopt/getopt.c
+++ b/usr.bin/getopt/getopt.c
@@ -1,3 +1,7 @@
+#ifndef lint
+static char rcsid[] = "$Id: getopt.c,v 1.2 1993/08/02 17:54:29 mycroft Exp $";
+#endif /* not lint */
+
#include <stdio.h>
main(argc, argv)
diff --git a/usr.bin/gprof/hp300.c b/usr.bin/gprof/hp300.c
index 6a474086a31..a34b3a8b445 100644
--- a/usr.bin/gprof/hp300.c
+++ b/usr.bin/gprof/hp300.c
@@ -1,3 +1,7 @@
+#ifndef lint
+static char rcsid[] = "$Id: hp300.c,v 1.2 1993/08/02 17:54:32 mycroft Exp $";
+#endif /* not lint */
+
#include "gprof.h"
/*
diff --git a/usr.bin/gprof/i386.c b/usr.bin/gprof/i386.c
index 6a474086a31..2b0f3c99929 100644
--- a/usr.bin/gprof/i386.c
+++ b/usr.bin/gprof/i386.c
@@ -1,3 +1,7 @@
+#ifndef lint
+static char rcsid[] = "$Id: i386.c,v 1.2 1993/08/02 17:54:33 mycroft Exp $";
+#endif /* not lint */
+
#include "gprof.h"
/*
diff --git a/usr.bin/m4/expr.c b/usr.bin/m4/expr.c
index fc48eb31e02..77ff7ce143f 100644
--- a/usr.bin/m4/expr.c
+++ b/usr.bin/m4/expr.c
@@ -67,6 +67,10 @@
x / 0 => error and return 0 from expr().
*/
+#ifndef lint
+static char rcsid[] = "$Id: expr.c,v 1.3 1993/08/02 17:54:38 mycroft Exp $";
+#endif /* not lint */
+
#define FALSE 0
#define TRUE 1
diff --git a/usr.bin/m4/extr.h b/usr.bin/m4/extr.h
index bf3ed92cec9..fd10b6d9351 100644
--- a/usr.bin/m4/extr.h
+++ b/usr.bin/m4/extr.h
@@ -1,6 +1,8 @@
/* Header : extr.h
Author : Ozan Yigit
Updated: %G%
+
+ $Id: extr.h,v 1.4 1993/08/02 17:54:40 mycroft Exp $
*/
#ifndef putback
diff --git a/usr.bin/m4/int2str.c b/usr.bin/m4/int2str.c
index 5ecc85b9ad9..7bf50236b6f 100644
--- a/usr.bin/m4/int2str.c
+++ b/usr.bin/m4/int2str.c
@@ -16,6 +16,10 @@
unsigned is what you generally want.
*/
+#ifndef lint
+static char rcsid[] = "$Id: int2str.c,v 1.2 1993/08/02 17:54:41 mycroft Exp $";
+#endif /* not lint */
+
static char dig_vec[] =
"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
diff --git a/usr.bin/m4/look.c b/usr.bin/m4/look.c
index 965e5901909..a3229989af9 100644
--- a/usr.bin/m4/look.c
+++ b/usr.bin/m4/look.c
@@ -4,6 +4,10 @@
Purpose: Hash table for M4
*/
+#ifndef lint
+static char rcsid[] = "$Id: look.c,v 1.3 1993/08/02 17:54:42 mycroft Exp $";
+#endif /* not lint */
+
#include "mdef.h"
#include "extr.h"
diff --git a/usr.bin/m4/main.c b/usr.bin/m4/main.c
index 14ccd9df6b1..fe5a97750f6 100644
--- a/usr.bin/m4/main.c
+++ b/usr.bin/m4/main.c
@@ -4,6 +4,10 @@
Defines: M4 macro processor.
*/
+#ifndef lint
+static char rcsid[] = "$Id: main.c,v 1.4 1993/08/02 17:54:43 mycroft Exp $";
+#endif /* not lint */
+
#include "mdef.h"
#include "extr.h"
#include "ourlims.h"
diff --git a/usr.bin/m4/mdef.h b/usr.bin/m4/mdef.h
index d8dc094fab7..332d3bf84c9 100644
--- a/usr.bin/m4/mdef.h
+++ b/usr.bin/m4/mdef.h
@@ -1,6 +1,8 @@
/* Header : mdef.h
Author : Ozan Yigit
Updated: 4 May 1992
+
+ $Id: mdef.h,v 1.3 1993/08/02 17:54:44 mycroft Exp $
*/
#ifndef MACRTYPE
diff --git a/usr.bin/m4/misc.c b/usr.bin/m4/misc.c
index 6d51835befb..1170b032911 100644
--- a/usr.bin/m4/misc.c
+++ b/usr.bin/m4/misc.c
@@ -4,6 +4,10 @@
Purpose: Miscellaneous support code for PD M4.
*/
+#ifndef lint
+static char rcsid[] = "$Id: misc.c,v 1.3 1993/08/02 17:54:45 mycroft Exp $";
+#endif /* not lint */
+
#include "mdef.h"
#include "extr.h"
#include "ourlims.h"
diff --git a/usr.bin/m4/ourlims.h b/usr.bin/m4/ourlims.h
index 8bc0b56c0a3..f98d1e6261c 100644
--- a/usr.bin/m4/ourlims.h
+++ b/usr.bin/m4/ourlims.h
@@ -1,6 +1,8 @@
/* File : ourlims.h
Author : Richard A. O'Keefe
Defines: UCHAR_MAX, CHAR_BIT, LONG_BIT
+
+ $Id: ourlims.h,v 1.2 1993/08/02 17:54:46 mycroft Exp $
*/
/* If <limits.h> is available, use that.
Otherwise, use 8-bit byte as the default.
diff --git a/usr.bin/m4/serv.c b/usr.bin/m4/serv.c
index 16dc1f6467d..063aa4b4b19 100644
--- a/usr.bin/m4/serv.c
+++ b/usr.bin/m4/serv.c
@@ -1 +1 @@
-revision 1.2 intentionally removed
+revision 1.3 intentionally removed
diff --git a/usr.bin/make/Makefile.dist b/usr.bin/make/Makefile.dist
index 1149e60facc..d92aeef6054 100644
--- a/usr.bin/make/Makefile.dist
+++ b/usr.bin/make/Makefile.dist
@@ -1,4 +1,4 @@
-# a very simple makefile...
+# $Id: Makefile.dist,v 1.3 1993/08/02 17:54:53 mycroft Exp $
CFLAGS = -I. -DMACHINE=\"sun3\"
diff --git a/usr.bin/make/lst.lib/Makefile.dist b/usr.bin/make/lst.lib/Makefile.dist
index 03232f872e7..0e2fd11f030 100644
--- a/usr.bin/make/lst.lib/Makefile.dist
+++ b/usr.bin/make/lst.lib/Makefile.dist
@@ -1,3 +1,4 @@
+# $Id: Makefile.dist,v 1.2 1993/08/02 17:54:50 mycroft Exp $
CFLAGS = -I..
diff --git a/usr.bin/man/catman/Makefile b/usr.bin/man/catman/Makefile
index d2d9285c684..217ee670027 100644
--- a/usr.bin/man/catman/Makefile
+++ b/usr.bin/man/catman/Makefile
@@ -1,6 +1,4 @@
-#
-# $Header: /cvsroot/src/usr.bin/man/catman/Attic/Makefile,v 1.1 1993/07/27 21:29:27 jtc Exp $
-#
+# $Id: Makefile,v 1.2 1993/08/02 17:54:57 mycroft Exp $
BINDIR= /usr/sbin
PROG= catman
diff --git a/usr.bin/man/catman/catman.8 b/usr.bin/man/catman/catman.8
index f407655fe9f..951561d4919 100644
--- a/usr.bin/man/catman/catman.8
+++ b/usr.bin/man/catman/catman.8
@@ -1,3 +1,5 @@
+.\" -*- nroff -*-
+.\"
.\" Copyright (c) 1993 Winning Strategies, Inc.
.\" All rights reserved.
.\"
@@ -26,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.
.\"
-.\" $Header: /cvsroot/src/usr.bin/man/catman/Attic/catman.8,v 1.1 1993/07/27 21:29:31 jtc Exp $
+.\" $Id: catman.8,v 1.2 1993/08/02 17:54:58 mycroft Exp $
.\"
.Dd July 30, 1993
.Dt CATMAN 8
diff --git a/usr.bin/man/catman/catman.c b/usr.bin/man/catman/catman.c
index b1d0f13b0a5..3fb45ef7efb 100644
--- a/usr.bin/man/catman/catman.c
+++ b/usr.bin/man/catman/catman.c
@@ -26,10 +26,12 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $Header: /cvsroot/src/usr.bin/man/catman/Attic/catman.c,v 1.1 1993/07/27 21:29:32 jtc Exp $
*/
+#ifndef lint
+static char rcsid[] = "$Id: catman.c,v 1.2 1993/08/02 17:54:59 mycroft Exp $";
+#endif /* not lint */
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/usr.bin/man/makewhatis/Makefile b/usr.bin/man/makewhatis/Makefile
index 87d2296b042..33cac4396bc 100644
--- a/usr.bin/man/makewhatis/Makefile
+++ b/usr.bin/man/makewhatis/Makefile
@@ -1,3 +1,5 @@
+# $Id: Makefile,v 1.2 1993/08/02 17:55:02 mycroft Exp $
+
BINDIR= /usr/libexec
NOMAN= noman
diff --git a/usr.bin/patch/EXTERN.h b/usr.bin/patch/EXTERN.h
index bc69310ac5e..509123f085b 100644
--- a/usr.bin/patch/EXTERN.h
+++ b/usr.bin/patch/EXTERN.h
@@ -1,13 +1,4 @@
-/* $Header: /cvsroot/src/usr.bin/patch/Attic/EXTERN.h,v 1.1 1993/04/09 11:33:51 cgd Exp $
- *
- * $Log: EXTERN.h,v $
- * Revision 1.1 1993/04/09 11:33:51 cgd
- * patch 2.0.12u8, from prep.ai.mit.edu. this is not under the GPL.
- *
- * Revision 2.0 86/09/17 15:35:37 lwall
- * Baseline for netwide release.
- *
- */
+/* $Id: EXTERN.h,v 1.2 1993/08/02 17:55:10 mycroft Exp $ */
#ifdef EXT
#undef EXT
diff --git a/usr.bin/patch/INTERN.h b/usr.bin/patch/INTERN.h
index 36c33bc27c3..cf287bdb7cd 100644
--- a/usr.bin/patch/INTERN.h
+++ b/usr.bin/patch/INTERN.h
@@ -1,13 +1,4 @@
-/* $Header: /cvsroot/src/usr.bin/patch/Attic/INTERN.h,v 1.1 1993/04/09 11:33:52 cgd Exp $
- *
- * $Log: INTERN.h,v $
- * Revision 1.1 1993/04/09 11:33:52 cgd
- * patch 2.0.12u8, from prep.ai.mit.edu. this is not under the GPL.
- *
- * Revision 2.0 86/09/17 15:35:58 lwall
- * Baseline for netwide release.
- *
- */
+/* $Id: INTERN.h,v 1.2 1993/08/02 17:55:11 mycroft Exp $ */
#ifdef EXT
#undef EXT
diff --git a/usr.bin/patch/Makefile b/usr.bin/patch/Makefile
index 4af63082dea..ded3785db0a 100644
--- a/usr.bin/patch/Makefile
+++ b/usr.bin/patch/Makefile
@@ -1,4 +1,4 @@
-# $Header: /cvsroot/src/usr.bin/patch/Makefile,v 1.1 1993/04/09 11:33:53 cgd Exp $
+# $Id: Makefile,v 1.2 1993/08/02 17:55:12 mycroft Exp $
PROG= patch
SRCS= patch.c pch.c inp.c version.c util.c backupfile.c
diff --git a/usr.bin/patch/backupfile.c b/usr.bin/patch/backupfile.c
index 6a384f9f182..cd8dc781a7d 100644
--- a/usr.bin/patch/backupfile.c
+++ b/usr.bin/patch/backupfile.c
@@ -11,6 +11,10 @@
/* David MacKenzie <djm@ai.mit.edu>.
Some algorithms adapted from GNU Emacs. */
+#ifndef lint
+static char rcsid[] = "$Id: backupfile.c,v 1.2 1993/08/02 17:55:13 mycroft Exp $";
+#endif /* not lint */
+
#include <stdio.h>
#include <ctype.h>
#include <sys/types.h>
diff --git a/usr.bin/patch/backupfile.h b/usr.bin/patch/backupfile.h
index 43240a13037..3a2d5bc96ef 100644
--- a/usr.bin/patch/backupfile.h
+++ b/usr.bin/patch/backupfile.h
@@ -6,7 +6,10 @@
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ $Id: backupfile.h,v 1.2 1993/08/02 17:55:14 mycroft Exp $
+*/
/* When to make backup files. */
enum backup_type
diff --git a/usr.bin/patch/common.h b/usr.bin/patch/common.h
index d2b02755902..27a90fbcda2 100644
--- a/usr.bin/patch/common.h
+++ b/usr.bin/patch/common.h
@@ -1,19 +1,4 @@
-/* $Header: /cvsroot/src/usr.bin/patch/common.h,v 1.1 1993/04/09 11:33:58 cgd Exp $
- *
- * $Log: common.h,v $
- * Revision 1.1 1993/04/09 11:33:58 cgd
- * patch 2.0.12u8, from prep.ai.mit.edu. this is not under the GPL.
- *
- * Revision 2.0.1.2 88/06/22 20:44:53 lwall
- * patch12: sprintf was declared wrong
- *
- * Revision 2.0.1.1 88/06/03 15:01:56 lwall
- * patch10: support for shorter extensions.
- *
- * Revision 2.0 86/09/17 15:36:39 lwall
- * Baseline for netwide release.
- *
- */
+/* $Id: common.h,v 1.2 1993/08/02 17:55:15 mycroft Exp $ */
#define DEBUGGING
diff --git a/usr.bin/patch/config.h b/usr.bin/patch/config.h
index dadba562cc4..d047d94957f 100644
--- a/usr.bin/patch/config.h
+++ b/usr.bin/patch/config.h
@@ -6,6 +6,8 @@
* Feel free to modify any of this as the need arises. Note, however,
* that running config.h.SH again will wipe out any changes you've made.
* For a more permanent change edit config.sh and rerun config.h.SH.
+ *
+ * $Id: config.h,v 1.2 1993/08/02 17:55:15 mycroft Exp $
*/
diff --git a/usr.bin/patch/inp.c b/usr.bin/patch/inp.c
index c42a2ac3248..d9c45efcaf4 100644
--- a/usr.bin/patch/inp.c
+++ b/usr.bin/patch/inp.c
@@ -1,16 +1,6 @@
-/* $Header: /cvsroot/src/usr.bin/patch/inp.c,v 1.1 1993/04/09 11:34:00 cgd Exp $
- *
- * $Log: inp.c,v $
- * Revision 1.1 1993/04/09 11:34:00 cgd
- * patch 2.0.12u8, from prep.ai.mit.edu. this is not under the GPL.
- *
- * Revision 2.0.1.1 88/06/03 15:06:13 lwall
- * patch10: made a little smarter about sccs files
- *
- * Revision 2.0 86/09/17 15:37:02 lwall
- * Baseline for netwide release.
- *
- */
+#ifndef lint
+static char rcsid[] = "$Id: inp.c,v 1.2 1993/08/02 17:55:16 mycroft Exp $";
+#endif /* not lint */
#include "EXTERN.h"
#include "common.h"
diff --git a/usr.bin/patch/inp.h b/usr.bin/patch/inp.h
index 1d7e6b5d238..d0eabe4fb6b 100644
--- a/usr.bin/patch/inp.h
+++ b/usr.bin/patch/inp.h
@@ -1,13 +1,4 @@
-/* $Header: /cvsroot/src/usr.bin/patch/inp.h,v 1.1 1993/04/09 11:34:01 cgd Exp $
- *
- * $Log: inp.h,v $
- * Revision 1.1 1993/04/09 11:34:01 cgd
- * patch 2.0.12u8, from prep.ai.mit.edu. this is not under the GPL.
- *
- * Revision 2.0 86/09/17 15:37:25 lwall
- * Baseline for netwide release.
- *
- */
+/* $Id: inp.h,v 1.2 1993/08/02 17:55:17 mycroft Exp $ */
EXT LINENUM input_lines INIT(0); /* how long is input file in lines */
EXT LINENUM last_frozen_line INIT(0); /* how many input lines have been */
diff --git a/usr.bin/patch/patch.1 b/usr.bin/patch/patch.1
index aa6c9e29fe2..cff4ebbf8cf 100644
--- a/usr.bin/patch/patch.1
+++ b/usr.bin/patch/patch.1
@@ -1,42 +1,5 @@
-.\" -*- nroff -*-
+.\" $Id: patch.1,v 1.2 1993/08/02 17:55:18 mycroft Exp $ -*- nroff -*-
.rn '' }`
-'\" $Header: /cvsroot/src/usr.bin/patch/patch.1,v 1.1 1993/04/09 11:34:04 cgd Exp $
-'\"
-'\" $Log: patch.1,v $
-'\" Revision 1.1 1993/04/09 11:34:04 cgd
-'\" patch 2.0.12u8, from prep.ai.mit.edu. this is not under the GPL.
-'\"
-'\" Revision 2.0.1.2 88/06/22 20:47:18 lwall
-'\" patch12: now avoids Bell System Logo
-'\"
-'\" Revision 2.0.1.1 88/06/03 15:12:51 lwall
-'\" patch10: -B switch was contributed.
-'\"
-'\" Revision 2.0 86/09/17 15:39:09 lwall
-'\" Baseline for netwide release.
-'\"
-'\" Revision 1.4 86/08/01 19:23:22 lwall
-'\" Documented -v, -p, -F.
-'\" Added notes to patch senders.
-'\"
-'\" Revision 1.3 85/03/26 15:11:06 lwall
-'\" Frozen.
-'\"
-'\" Revision 1.2.1.4 85/03/12 16:14:27 lwall
-'\" Documented -p.
-'\"
-'\" Revision 1.2.1.3 85/03/12 16:09:41 lwall
-'\" Documented -D.
-'\"
-'\" Revision 1.2.1.2 84/12/05 11:06:55 lwall
-'\" Added -l switch, and noted bistability bug.
-'\"
-'\" Revision 1.2.1.1 84/12/04 17:23:39 lwall
-'\" Branch for sdcrdcf changes.
-'\"
-'\" Revision 1.2 84/12/04 17:22:02 lwall
-'\" Baseline version.
-'\"
.de Sh
.br
.ne 5
diff --git a/usr.bin/patch/patch.c b/usr.bin/patch/patch.c
index f94608fa7a2..89f911512d2 100644
--- a/usr.bin/patch/patch.c
+++ b/usr.bin/patch/patch.c
@@ -1,98 +1,15 @@
-char rcsid[] =
- "$Header: /cvsroot/src/usr.bin/patch/patch.c,v 1.1 1993/04/09 11:34:05 cgd Exp $";
-
/* patch - a program to apply diffs to original files
*
* Copyright 1986, Larry Wall
*
* This program may be copied as long as you don't try to make any
* money off of it, or pretend that you wrote it.
- *
- * $Log: patch.c,v $
- * Revision 1.1 1993/04/09 11:34:05 cgd
- * patch 2.0.12u8, from prep.ai.mit.edu. this is not under the GPL.
- *
- * Revision 2.0.2.0 90/05/01 22:17:50 davison
- * patch12u: unidiff support added
- *
- * Revision 2.0.1.6 88/06/22 20:46:39 lwall
- * patch12: rindex() wasn't declared
- *
- * Revision 2.0.1.5 88/06/03 15:09:37 lwall
- * patch10: exit code improved.
- * patch10: better support for non-flexfilenames.
- *
- * Revision 2.0.1.4 87/02/16 14:00:04 lwall
- * Short replacement caused spurious "Out of sync" message.
- *
- * Revision 2.0.1.3 87/01/30 22:45:50 lwall
- * Improved diagnostic on sync error.
- * Moved do_ed_script() to pch.c.
- *
- * Revision 2.0.1.2 86/11/21 09:39:15 lwall
- * Fuzz factor caused offset of installed lines.
- *
- * Revision 2.0.1.1 86/10/29 13:10:22 lwall
- * Backwards search could terminate prematurely.
- *
- * Revision 2.0 86/09/17 15:37:32 lwall
- * Baseline for netwide release.
- *
- * Revision 1.5 86/08/01 20:53:24 lwall
- * Changed some %d's to %ld's.
- * Linted.
- *
- * Revision 1.4 86/08/01 19:17:29 lwall
- * Fixes for machines that can't vararg.
- * Added fuzz factor.
- * Generalized -p.
- * General cleanup.
- *
- * 85/08/15 van%ucbmonet@berkeley
- * Changes for 4.3bsd diff -c.
- *
- * Revision 1.3 85/03/26 15:07:43 lwall
- * Frozen.
- *
- * Revision 1.2.1.9 85/03/12 17:03:35 lwall
- * Changed pfp->_file to fileno(pfp).
- *
- * Revision 1.2.1.8 85/03/12 16:30:43 lwall
- * Check i_ptr and i_womp to make sure they aren't null before freeing.
- * Also allow ed output to be suppressed.
- *
- * Revision 1.2.1.7 85/03/12 15:56:13 lwall
- * Added -p option from jromine@uci-750a.
- *
- * Revision 1.2.1.6 85/03/12 12:12:51 lwall
- * Now checks for normalness of file to patch.
- *
- * Revision 1.2.1.5 85/03/12 11:52:12 lwall
- * Added -D (#ifdef) option from joe@fluke.
- *
- * Revision 1.2.1.4 84/12/06 11:14:15 lwall
- * Made smarter about SCCS subdirectories.
- *
- * Revision 1.2.1.3 84/12/05 11:18:43 lwall
- * Added -l switch to do loose string comparison.
- *
- * Revision 1.2.1.2 84/12/04 09:47:13 lwall
- * Failed hunk count not reset on multiple patch file.
- *
- * Revision 1.2.1.1 84/12/04 09:42:37 lwall
- * Branch for sdcrdcf changes.
- *
- * Revision 1.2 84/11/29 13:29:51 lwall
- * Linted. Identifiers uniqified. Fixed i_ptr malloc() bug. Fixed
- * multiple calls to mktemp(). Will now work on machines that can only
- * read 32767 chars. Added -R option for diffs with new and old swapped.
- * Various cosmetic changes.
- *
- * Revision 1.1 84/11/09 17:03:58 lwall
- * Initial revision
- *
*/
+#ifndef lint
+static char rcsid[] = "$Id: patch.c,v 1.2 1993/08/02 17:55:19 mycroft Exp $";
+#endif /* not lint */
+
#include "INTERN.h"
#include "common.h"
#include "EXTERN.h"
diff --git a/usr.bin/patch/patchlevel.h b/usr.bin/patch/patchlevel.h
index 4dc77e8668b..510e6fb892f 100644
--- a/usr.bin/patch/patchlevel.h
+++ b/usr.bin/patch/patchlevel.h
@@ -1 +1,3 @@
+/* $Id: patchlevel.h,v 1.2 1993/08/02 17:55:20 mycroft Exp $ */
+
#define PATCHLEVEL "12u8"
diff --git a/usr.bin/patch/pch.c b/usr.bin/patch/pch.c
index 480e490fd2f..3062588e3e6 100644
--- a/usr.bin/patch/pch.c
+++ b/usr.bin/patch/pch.c
@@ -1,39 +1,6 @@
-/* $Header: /cvsroot/src/usr.bin/patch/pch.c,v 1.1 1993/04/09 11:34:07 cgd Exp $
- *
- * $Log: pch.c,v $
- * Revision 1.1 1993/04/09 11:34:07 cgd
- * patch 2.0.12u8, from prep.ai.mit.edu. this is not under the GPL.
- *
- * Revision 2.0.2.0 90/05/01 22:17:51 davison
- * patch12u: unidiff support added
- *
- * Revision 2.0.1.7 88/06/03 15:13:28 lwall
- * patch10: Can now find patches in shar scripts.
- * patch10: Hunks that swapped and then swapped back could core dump.
- *
- * Revision 2.0.1.6 87/06/04 16:18:13 lwall
- * pch_swap didn't swap p_bfake and p_efake.
- *
- * Revision 2.0.1.5 87/01/30 22:47:42 lwall
- * Improved responses to mangled patches.
- *
- * Revision 2.0.1.4 87/01/05 16:59:53 lwall
- * New-style context diffs caused double call to free().
- *
- * Revision 2.0.1.3 86/11/14 10:08:33 lwall
- * Fixed problem where a long pattern wouldn't grow the hunk.
- * Also restored p_input_line when backtracking so error messages are right.
- *
- * Revision 2.0.1.2 86/11/03 17:49:52 lwall
- * New-style delete triggers spurious assertion error.
- *
- * Revision 2.0.1.1 86/10/29 15:52:08 lwall
- * Could falsely report new-style context diff.
- *
- * Revision 2.0 86/09/17 15:39:37 lwall
- * Baseline for netwide release.
- *
- */
+#ifndef lint
+static char rcsid[] = "$Id: pch.c,v 1.2 1993/08/02 17:55:21 mycroft Exp $";
+#endif /* not lint */
#include "EXTERN.h"
#include "common.h"
diff --git a/usr.bin/patch/pch.h b/usr.bin/patch/pch.h
index 32e50165e1e..f892fc3b7c1 100644
--- a/usr.bin/patch/pch.h
+++ b/usr.bin/patch/pch.h
@@ -1,16 +1,4 @@
-/* $Header: /cvsroot/src/usr.bin/patch/pch.h,v 1.1 1993/04/09 11:34:09 cgd Exp $
- *
- * $Log: pch.h,v $
- * Revision 1.1 1993/04/09 11:34:09 cgd
- * patch 2.0.12u8, from prep.ai.mit.edu. this is not under the GPL.
- *
- * Revision 2.0.1.1 87/01/30 22:47:16 lwall
- * Added do_ed_script().
- *
- * Revision 2.0 86/09/17 15:39:57 lwall
- * Baseline for netwide release.
- *
- */
+/* $Id: pch.h,v 1.2 1993/08/02 17:55:22 mycroft Exp $ */
EXT FILE *pfp INIT(Nullfp); /* patch file pointer */
diff --git a/usr.bin/patch/util.c b/usr.bin/patch/util.c
index e33f21ddbda..848cf2d8b18 100644
--- a/usr.bin/patch/util.c
+++ b/usr.bin/patch/util.c
@@ -1,3 +1,7 @@
+#ifndef lint
+static char rcsid[] = "$Id: util.c,v 1.2 1993/08/02 17:55:23 mycroft Exp $";
+#endif /* not lint */
+
#include "EXTERN.h"
#include "common.h"
#include "INTERN.h"
diff --git a/usr.bin/patch/util.h b/usr.bin/patch/util.h
index 80c8279e69b..75ede69ce4f 100644
--- a/usr.bin/patch/util.h
+++ b/usr.bin/patch/util.h
@@ -1,13 +1,4 @@
-/* $Header: /cvsroot/src/usr.bin/patch/util.h,v 1.1 1993/04/09 11:34:11 cgd Exp $
- *
- * $Log: util.h,v $
- * Revision 1.1 1993/04/09 11:34:11 cgd
- * patch 2.0.12u8, from prep.ai.mit.edu. this is not under the GPL.
- *
- * Revision 2.0 86/09/17 15:40:06 lwall
- * Baseline for netwide release.
- *
- */
+/* $Id: util.h,v 1.2 1993/08/02 17:55:25 mycroft Exp $ */
/* and for those machine that can't handle a variable argument list */
diff --git a/usr.bin/patch/version.c b/usr.bin/patch/version.c
index 2a6503d33bb..a4d4f8746e8 100644
--- a/usr.bin/patch/version.c
+++ b/usr.bin/patch/version.c
@@ -1,13 +1,6 @@
-/* $Header: /cvsroot/src/usr.bin/patch/Attic/version.c,v 1.1 1993/04/09 11:34:12 cgd Exp $
- *
- * $Log: version.c,v $
- * Revision 1.1 1993/04/09 11:34:12 cgd
- * patch 2.0.12u8, from prep.ai.mit.edu. this is not under the GPL.
- *
- * Revision 2.0 86/09/17 15:40:11 lwall
- * Baseline for netwide release.
- *
- */
+#ifndef lint
+static char rcsid[] = "$Id: version.c,v 1.2 1993/08/02 17:55:25 mycroft Exp $";
+#endif /* not lint */
#include "EXTERN.h"
#include "common.h"
diff --git a/usr.bin/patch/version.h b/usr.bin/patch/version.h
index 74aa17f17bb..39e2e8d91bd 100644
--- a/usr.bin/patch/version.h
+++ b/usr.bin/patch/version.h
@@ -1,12 +1,3 @@
-/* $Header: /cvsroot/src/usr.bin/patch/Attic/version.h,v 1.1 1993/04/09 11:34:13 cgd Exp $
- *
- * $Log: version.h,v $
- * Revision 1.1 1993/04/09 11:34:13 cgd
- * patch 2.0.12u8, from prep.ai.mit.edu. this is not under the GPL.
- *
- * Revision 2.0 86/09/17 15:40:14 lwall
- * Baseline for netwide release.
- *
- */
+/* $Id: version.h,v 1.2 1993/08/02 17:55:26 mycroft Exp $ */
void version();
diff --git a/usr.bin/ref/Makefile b/usr.bin/ref/Makefile
index 32de9d5103c..022219d30eb 100644
--- a/usr.bin/ref/Makefile
+++ b/usr.bin/ref/Makefile
@@ -1,7 +1,7 @@
+# $Id: Makefile,v 1.2 1993/08/02 17:55:30 mycroft Exp $
PROG= ref
CFLAGS+=-I${.CURDIR}/../elvis
-SRCS= ref.c
.include <bsd.prog.mk>
.PATH: ${.CURDIR}/../elvis
diff --git a/usr.bin/ref/ref.1 b/usr.bin/ref/ref.1
index e7d2e178f14..6c227db4f2f 100644
--- a/usr.bin/ref/ref.1
+++ b/usr.bin/ref/ref.1
@@ -1,3 +1,4 @@
+.\" $Id: ref.1,v 1.2 1993/08/02 17:55:30 mycroft Exp $ -*- nroff -*-
.TH REF 1
.SH NAME
ref - Display a C function header
diff --git a/usr.bin/ref/ref.c b/usr.bin/ref/ref.c
index 0cc105fbea1..d7b57b8d27f 100644
--- a/usr.bin/ref/ref.c
+++ b/usr.bin/ref/ref.c
@@ -9,6 +9,11 @@
* -f file default filename for static functions
* -c class default class names for class functions
*/
+
+#ifndef lint
+static char rcsid[] = "$Id: ref.c,v 1.2 1993/08/02 17:55:31 mycroft Exp $";
+#endif /* not lint */
+
#ifdef __STDC__
# include <string.h>
# include <stdlib.h>
diff --git a/usr.bin/rpcgen/Makefile b/usr.bin/rpcgen/Makefile
index 6eef62547a5..c724554805e 100644
--- a/usr.bin/rpcgen/Makefile
+++ b/usr.bin/rpcgen/Makefile
@@ -1,3 +1,4 @@
+# $Id: Makefile,v 1.2 1993/08/02 17:55:35 mycroft Exp $
PROG= rpcgen
SRCS= rpc_clntout.c rpc_cout.c rpc_hout.c rpc_main.c rpc_parse.c rpc_scan.c \
diff --git a/usr.bin/rup/Makefile b/usr.bin/rup/Makefile
index f295742eb73..4554dc167a2 100644
--- a/usr.bin/rup/Makefile
+++ b/usr.bin/rup/Makefile
@@ -1,8 +1,4 @@
-#
-# a makefile for /usr/bin/rup
-#
-# $Header: /cvsroot/src/usr.bin/rup/Makefile,v 1.2 1993/06/04 14:53:53 brezak Exp $
-#
+# $Id: Makefile,v 1.3 1993/08/02 17:55:38 mycroft Exp $
PROG = rup
MAN1= rup.0
diff --git a/usr.bin/rup/rup.1 b/usr.bin/rup/rup.1
index c332abb335d..00d9242f10a 100644
--- a/usr.bin/rup/rup.1
+++ b/usr.bin/rup/rup.1
@@ -1,3 +1,5 @@
+.\" -*- nroff -*-
+.\"
.\" Copyright (c) 1985, 1991 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -29,6 +31,8 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
+.\" $Id: rup.1,v 1.4 1993/08/02 17:55:40 mycroft Exp $
+.\"
.Dd June 7, 1993
.Dt RUP 1
.Os BSD 4.3
diff --git a/usr.bin/rup/rup.c b/usr.bin/rup/rup.c
index 53267d8fbd3..70f6c802592 100644
--- a/usr.bin/rup/rup.c
+++ b/usr.bin/rup/rup.c
@@ -31,6 +31,10 @@
* SUCH DAMAGE.
*/
+#ifndef lint
+static char rcsid[] = "$Id: rup.c,v 1.5 1993/08/02 17:55:42 mycroft Exp $";
+#endif /* not lint */
+
#include <stdio.h>
#include <string.h>
#include <time.h>
diff --git a/usr.bin/rusers/Makefile b/usr.bin/rusers/Makefile
index 9e273048e37..28872bf5ad7 100644
--- a/usr.bin/rusers/Makefile
+++ b/usr.bin/rusers/Makefile
@@ -1,8 +1,4 @@
-#
-# a makefile for /usr/bin/rusers
-#
-# $Header: /cvsroot/src/usr.bin/rusers/Makefile,v 1.3 1993/06/08 19:22:59 brezak Exp $
-#
+# $Id: Makefile,v 1.4 1993/08/02 17:55:45 mycroft Exp $
PROG = rusers
MAN1 = rusers.0
diff --git a/usr.bin/rusers/rusers.c b/usr.bin/rusers/rusers.c
index 2861aed9403..4efaba86baa 100644
--- a/usr.bin/rusers/rusers.c
+++ b/usr.bin/rusers/rusers.c
@@ -31,6 +31,10 @@
* SUCH DAMAGE.
*/
+#ifndef lint
+static char rcsid[] = "$Id: rusers.c,v 1.4 1993/08/02 17:55:46 mycroft Exp $";
+#endif /* not lint */
+
#include <sys/types.h>
#include <sys/param.h>
#include <sys/socket.h>
diff --git a/usr.bin/rwall/Makefile b/usr.bin/rwall/Makefile
index 6ac9d9fcccf..c64cdf5f35f 100644
--- a/usr.bin/rwall/Makefile
+++ b/usr.bin/rwall/Makefile
@@ -1,8 +1,4 @@
-#
-# a makefile for /usr/bin/rwall
-#
-# $Header: /cvsroot/src/usr.bin/rwall/Makefile,v 1.4 1993/06/08 19:24:16 brezak Exp $
-#
+# $Id: Makefile,v 1.5 1993/08/02 17:55:49 mycroft Exp $
PROG = rwall
MAN1 = rwall.0
diff --git a/usr.bin/tn3270/Makefile b/usr.bin/tn3270/Makefile
index dff368670c9..693f871f797 100644
--- a/usr.bin/tn3270/Makefile
+++ b/usr.bin/tn3270/Makefile
@@ -1,4 +1,4 @@
-# $Header: /cvsroot/src/usr.bin/tn3270/Attic/Makefile,v 1.2 1993/04/27 06:47:28 cgd Exp $
+# $Id: Makefile,v 1.3 1993/08/02 17:56:23 mycroft Exp $
.if !make(install)
SUBDIR += tools
diff --git a/usr.bin/tn3270/Makefile.inc b/usr.bin/tn3270/Makefile.inc
index 1c2bb43612f..a3f5d82a2ef 100644
--- a/usr.bin/tn3270/Makefile.inc
+++ b/usr.bin/tn3270/Makefile.inc
@@ -1,4 +1,4 @@
-# $Header: /cvsroot/src/usr.bin/tn3270/Attic/Makefile.inc,v 1.3 1993/06/18 05:41:32 cgd Exp $
+# $Id: Makefile.inc,v 1.4 1993/08/02 17:56:24 mycroft Exp $
CFLAGS += -DTERMCAP -DSRCRT -DKLUDGELINEMODE -DUSE_TERMIO -DTN3270
KBD = unix.kbd
diff --git a/usr.bin/tn3270/mset/Makefile b/usr.bin/tn3270/mset/Makefile
index 17f750190c1..7ca4dfe6203 100644
--- a/usr.bin/tn3270/mset/Makefile
+++ b/usr.bin/tn3270/mset/Makefile
@@ -1,4 +1,4 @@
-# $Header: /cvsroot/src/usr.bin/tn3270/mset/Attic/Makefile,v 1.5 1993/04/29 11:05:59 cgd Exp $
+# $Id: Makefile,v 1.6 1993/08/02 17:55:52 mycroft Exp $
.include <../../Makefile.inc>
diff --git a/usr.bin/tn3270/tn3270/Makefile b/usr.bin/tn3270/tn3270/Makefile
index 8ef5ff830b5..7dad093f4f7 100644
--- a/usr.bin/tn3270/tn3270/Makefile
+++ b/usr.bin/tn3270/tn3270/Makefile
@@ -1,4 +1,4 @@
-# $Header: /cvsroot/src/usr.bin/tn3270/tn3270/Attic/Makefile,v 1.5 1993/07/28 01:36:35 cgd Exp $
+# $Id: Makefile,v 1.6 1993/08/02 17:55:57 mycroft Exp $
.include <../../Makefile.inc>
diff --git a/usr.bin/tn3270/tools/Makefile b/usr.bin/tn3270/tools/Makefile
index b411b71d9a6..87de2811ff4 100644
--- a/usr.bin/tn3270/tools/Makefile
+++ b/usr.bin/tn3270/tools/Makefile
@@ -1,4 +1,4 @@
-# $Header: /cvsroot/src/usr.bin/tn3270/tools/Attic/Makefile,v 1.2 1993/04/27 06:47:40 cgd Exp $
+# $Id: Makefile,v 1.3 1993/08/02 17:56:20 mycroft Exp $
SUBDIR = mkhits mkastosc mkastods mkdstoas mkdctype
diff --git a/usr.bin/tn3270/tools/mkastods/Makefile b/usr.bin/tn3270/tools/mkastods/Makefile
index b2c6fbd7921..3dde363fdbf 100644
--- a/usr.bin/tn3270/tools/mkastods/Makefile
+++ b/usr.bin/tn3270/tools/mkastods/Makefile
@@ -1,4 +1,4 @@
-# $Header: /cvsroot/src/usr.bin/tn3270/tools/mkastods/Attic/Makefile,v 1.3 1993/04/27 06:47:42 cgd Exp $
+# $Id: Makefile,v 1.4 1993/08/02 17:56:01 mycroft Exp $
CFLAGS += -I${.CURDIR}/.. -I.
diff --git a/usr.bin/tn3270/tools/mkastosc/Makefile b/usr.bin/tn3270/tools/mkastosc/Makefile
index 792c75d7766..168d1cb6faf 100644
--- a/usr.bin/tn3270/tools/mkastosc/Makefile
+++ b/usr.bin/tn3270/tools/mkastosc/Makefile
@@ -1,4 +1,4 @@
-# $Header: /cvsroot/src/usr.bin/tn3270/tools/mkastosc/Attic/Makefile,v 1.3 1993/04/27 06:47:44 cgd Exp $
+# $Id: Makefile,v 1.4 1993/08/02 17:56:05 mycroft Exp $
CFLAGS += -I${.CURDIR}/../mkhits -I${.CURDIR}/.. -I.
diff --git a/usr.bin/tn3270/tools/mkdctype/Makefile b/usr.bin/tn3270/tools/mkdctype/Makefile
index 0cd4716dd1c..1c73a8daa07 100644
--- a/usr.bin/tn3270/tools/mkdctype/Makefile
+++ b/usr.bin/tn3270/tools/mkdctype/Makefile
@@ -1,4 +1,4 @@
-# $Header: /cvsroot/src/usr.bin/tn3270/tools/mkdctype/Attic/Makefile,v 1.3 1993/04/27 06:47:46 cgd Exp $
+# $Id: Makefile,v 1.4 1993/08/02 17:56:09 mycroft Exp $
CFLAGS += -I${.CURDIR}/.. -I.
diff --git a/usr.bin/tn3270/tools/mkdstoas/Makefile b/usr.bin/tn3270/tools/mkdstoas/Makefile
index ced7ecbd6d0..22a633bb157 100644
--- a/usr.bin/tn3270/tools/mkdstoas/Makefile
+++ b/usr.bin/tn3270/tools/mkdstoas/Makefile
@@ -1,4 +1,4 @@
-# $Header: /cvsroot/src/usr.bin/tn3270/tools/mkdstoas/Attic/Makefile,v 1.3 1993/04/27 06:47:48 cgd Exp $
+# $Id: Makefile,v 1.4 1993/08/02 17:56:13 mycroft Exp $
CFLAGS += -I${.CURDIR}/.. -I.
diff --git a/usr.bin/tn3270/tools/mkhits/Makefile b/usr.bin/tn3270/tools/mkhits/Makefile
index d38d2dc55f1..3731ecad615 100644
--- a/usr.bin/tn3270/tools/mkhits/Makefile
+++ b/usr.bin/tn3270/tools/mkhits/Makefile
@@ -1,4 +1,4 @@
-# $Header: /cvsroot/src/usr.bin/tn3270/tools/mkhits/Attic/Makefile,v 1.3 1993/04/27 06:47:50 cgd Exp $
+# $Id: Makefile,v 1.4 1993/08/02 17:56:16 mycroft Exp $
CFLAGS += -I${.CURDIR}/.. -I.
diff --git a/usr.bin/uname/uname.c b/usr.bin/uname/uname.c
index f88596727f2..18d4fd9596a 100644
--- a/usr.bin/uname/uname.c
+++ b/usr.bin/uname/uname.c
@@ -7,7 +7,12 @@
* -v prints os version
* -m prints machine name
* -a prinst all the above information
-*/
+ */
+
+#ifndef lint
+static char rcsid[] = "$Id: uname.c,v 1.2 1993/08/02 17:56:27 mycroft Exp $";
+#endif /* not lint */
+
#include <stdio.h>
#include <unistd.h>
#include <sys/utsname.h>
diff --git a/usr.bin/yacc/closure.c b/usr.bin/yacc/closure.c
index 7c8f9579154..42264955622 100644
--- a/usr.bin/yacc/closure.c
+++ b/usr.bin/yacc/closure.c
@@ -1,3 +1,7 @@
+#ifndef lint
+static char rcsid[] = "$Id: closure.c,v 1.3 1993/08/02 17:56:35 mycroft Exp $";
+#endif /* not lint */
+
#include "defs.h"
short *itemset;
diff --git a/usr.bin/yacc/defs.h b/usr.bin/yacc/defs.h
index 023af489849..842eec1d108 100644
--- a/usr.bin/yacc/defs.h
+++ b/usr.bin/yacc/defs.h
@@ -1,3 +1,5 @@
+/* $Id: defs.h,v 1.3 1993/08/02 17:56:36 mycroft Exp $ */
+
#include <assert.h>
#include <ctype.h>
#include <stdio.h>
diff --git a/usr.bin/yacc/error.c b/usr.bin/yacc/error.c
index 3ed564c629b..5ae4d966a6b 100644
--- a/usr.bin/yacc/error.c
+++ b/usr.bin/yacc/error.c
@@ -1,5 +1,9 @@
/* routines for printing error messages */
+#ifndef lint
+static char rcsid[] = "$Id: error.c,v 1.3 1993/08/02 17:56:37 mycroft Exp $";
+#endif /* not lint */
+
#include "defs.h"
diff --git a/usr.bin/yacc/lalr.c b/usr.bin/yacc/lalr.c
index 640ddc4ca7a..8196c8bdcdc 100644
--- a/usr.bin/yacc/lalr.c
+++ b/usr.bin/yacc/lalr.c
@@ -1,3 +1,7 @@
+#ifndef lint
+static char rcsid[] = "$Id: lalr.c,v 1.3 1993/08/02 17:56:38 mycroft Exp $";
+#endif /* not lint */
+
#include "defs.h"
typedef
diff --git a/usr.bin/yacc/lr0.c b/usr.bin/yacc/lr0.c
index 3ee42a88406..1f1d0c5bb5b 100644
--- a/usr.bin/yacc/lr0.c
+++ b/usr.bin/yacc/lr0.c
@@ -1,3 +1,6 @@
+#ifndef lint
+static char rcsid[] = "$Id: lr0.c,v 1.3 1993/08/02 17:56:39 mycroft Exp $";
+#endif /* not lint */
#include "defs.h"
diff --git a/usr.bin/yacc/main.c b/usr.bin/yacc/main.c
index f17e19b435c..e8f910fc7d5 100644
--- a/usr.bin/yacc/main.c
+++ b/usr.bin/yacc/main.c
@@ -1,3 +1,7 @@
+#ifndef lint
+static char rcsid[] = "$Id: main.c,v 1.3 1993/08/02 17:56:41 mycroft Exp $";
+#endif /* not lint */
+
#include <signal.h>
#include "defs.h"
diff --git a/usr.bin/yacc/mkpar.c b/usr.bin/yacc/mkpar.c
index e1aef60fec4..c4b979ba9ca 100644
--- a/usr.bin/yacc/mkpar.c
+++ b/usr.bin/yacc/mkpar.c
@@ -1,3 +1,6 @@
+#ifndef lint
+static char rcsid[] = "$Id: mkpar.c,v 1.3 1993/08/02 17:56:42 mycroft Exp $";
+#endif /* not lint */
#include "defs.h"
diff --git a/usr.bin/yacc/output.c b/usr.bin/yacc/output.c
index 88c77b52f68..e71ca1fd56a 100644
--- a/usr.bin/yacc/output.c
+++ b/usr.bin/yacc/output.c
@@ -1,3 +1,7 @@
+#ifndef lint
+static char rcsid[] = "$Id: output.c,v 1.3 1993/08/02 17:56:43 mycroft Exp $";
+#endif /* not lint */
+
#include "defs.h"
static int nvectors;
diff --git a/usr.bin/yacc/reader.c b/usr.bin/yacc/reader.c
index 059a04371c7..499ffa97bd2 100644
--- a/usr.bin/yacc/reader.c
+++ b/usr.bin/yacc/reader.c
@@ -1,3 +1,7 @@
+#ifndef lint
+static char rcsid[] = "$Id: reader.c,v 1.3 1993/08/02 17:56:49 mycroft Exp $";
+#endif /* not lint */
+
#include "defs.h"
/* The line size must be a positive integer. One hundred was chosen */
diff --git a/usr.bin/yacc/symtab.c b/usr.bin/yacc/symtab.c
index c7c6ac03a79..4c9f1cd9737 100644
--- a/usr.bin/yacc/symtab.c
+++ b/usr.bin/yacc/symtab.c
@@ -1,5 +1,8 @@
-#include "defs.h"
+#ifndef lint
+static char rcsid[] = "$Id: symtab.c,v 1.3 1993/08/02 17:56:50 mycroft Exp $";
+#endif /* not lint */
+#include "defs.h"
/* TABLE_SIZE is the number of entries in the symbol table. */
/* TABLE_SIZE must be a power of two. */
diff --git a/usr.bin/yacc/verbose.c b/usr.bin/yacc/verbose.c
index 2c7cc52c77e..08e95de570c 100644
--- a/usr.bin/yacc/verbose.c
+++ b/usr.bin/yacc/verbose.c
@@ -1,3 +1,6 @@
+#ifndef lint
+static char rcsid[] = "$Id: verbose.c,v 1.3 1993/08/02 17:56:51 mycroft Exp $";
+#endif /* not lint */
#include "defs.h"
diff --git a/usr.bin/yacc/warshall.c b/usr.bin/yacc/warshall.c
index b449e4e274e..d22b7d0862a 100644
--- a/usr.bin/yacc/warshall.c
+++ b/usr.bin/yacc/warshall.c
@@ -1,3 +1,7 @@
+#ifndef lint
+static char rcsid[] = "$Id: warshall.c,v 1.3 1993/08/02 17:56:52 mycroft Exp $";
+#endif /* not lint */
+
#include "defs.h"
transitive_closure(R, n)
diff --git a/usr.bin/yacc/yacc.1 b/usr.bin/yacc/yacc.1
index 742633d5958..b9f3a1160fb 100644
--- a/usr.bin/yacc/yacc.1
+++ b/usr.bin/yacc/yacc.1
@@ -1,5 +1,4 @@
-.\" %W% %R% (Berkeley) %E%
-.\"
+.\" $Id: yacc.1,v 1.3 1993/08/02 17:56:53 mycroft Exp $ -*- nroff -*-
.TH YACC 1 "July\ 15,\ 1990"
.UC 6
.SH NAME