sccsid -> rcsid and fix some minor nits.

8 files changed, 46 insertions, 21 deletions

diff --git a/bin/ed/buf.c b/bin/ed/buf.c
index 567133a..34574c5 100644
--- a/bin/ed/buf.c
+++ b/bin/ed/buf.c
@@ -24,11 +24,15 @@
  * 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.
- *
- *	$Id: buf.c,v 1.10 1997/02/22 14:03:11 peter Exp $
  */
+
 #ifndef lint
+#if 0
 static char * const rcsid = "@(#)buf.c,v 1.4 1994/02/01 00:34:35 alm Exp";
+#else
+static char * const rcsid =
+	"$Id: buf.c,v 1.11 1997/03/24 05:45:29 imp Exp $";
+#endif
 #endif /* not lint */
 
 #include <sys/file.h>
diff --git a/bin/ed/cbc.c b/bin/ed/cbc.c
index 9367853..dbae5f9 100644
--- a/bin/ed/cbc.c
+++ b/bin/ed/cbc.c
@@ -35,16 +35,23 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)bdes.c	5.5 (Berkeley) 6/27/91
- *	$Id$
  */
 
 #ifndef lint
+#if 0
 static char * const rcsid = "@(#)cbc.c,v 1.2 1994/02/01 00:34:36 alm Exp";
+#else
+static char * const rcsid =
+	"$Id: cbc.c,v 1.9 1997/02/22 14:03:12 peter Exp $";
+#endif
 #endif /* not lint */
 
 #include <sys/types.h>
 #include <errno.h>
 #include <pwd.h>
+#ifdef DES
+#include <time.h>
+#endif
 
 #include "ed.h"
 
diff --git a/bin/ed/glbl.c b/bin/ed/glbl.c
index 9d77f25..a40bca6 100644
--- a/bin/ed/glbl.c
+++ b/bin/ed/glbl.c
@@ -24,12 +24,15 @@
  * 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.
- *
- *	$Id$
  */
 
 #ifndef lint
+#if 0
 static char * const rcsid = "@(#)glob.c,v 1.1 1994/02/01 00:34:40 alm Exp";
+#else
+static char * const rcsid =
+	"$Id: glbl.c,v 1.7 1997/02/22 14:03:15 peter Exp $";
+#endif
 #endif /* not lint */
 
 #include <sys/ioctl.h>
diff --git a/bin/ed/io.c b/bin/ed/io.c
index af06466..6702765 100644
--- a/bin/ed/io.c
+++ b/bin/ed/io.c
@@ -23,12 +23,15 @@
  * 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.
- *
- *	$Id$
  */
 
 #ifndef lint
+#if 0
 static char * const rcsid = "@(#)io.c,v 1.1 1994/02/01 00:34:41 alm Exp";
+#else
+static char * const rcsid =
+	"$Id: io.c,v 1.8 1997/02/22 14:03:16 peter Exp $";
+#endif
 #endif /* not lint */
 
 #include "ed.h"
diff --git a/bin/ed/main.c b/bin/ed/main.c
index d17ab62..abeff54 100644
--- a/bin/ed/main.c
+++ b/bin/ed/main.c
@@ -24,8 +24,6 @@
  * 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.
- *
- *	$Id: main.c,v 1.9 1997/02/22 14:03:17 peter Exp $
  */
 
 #ifndef lint
@@ -35,7 +33,12 @@ static char * const copyright =
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static char * const rcsid = "@(#)main.c,v 1.1 1994/02/01 00:34:42 alm Exp";
+#else
+static char * const rcsid =
+	"$Id: main.c,v 1.10 1997/03/28 15:24:19 imp Exp $";
+#endif
 #endif /* not lint */
 
 /*
@@ -57,9 +60,9 @@ static char * const rcsid = "@(#)main.c,v 1.1 1994/02/01 00:34:42 alm Exp";
 #include <sys/ioctl.h>
 #include <sys/wait.h>
 #include <ctype.h>
-#include <setjmp.h>
-#include <pwd.h>
 #include <locale.h>
+#include <pwd.h>
+#include <setjmp.h>
 
 #include "ed.h"
 
@@ -100,10 +103,6 @@ char *dps = "*";		/* default command-line prompt */
 
 char *usage = "usage: %s [-] [-sx] [-p string] [name]\n";
 
-extern char errmsg[];
-extern int optind;
-extern char *optarg;
-
 /* ed: line editor */
 int
 main(argc, argv)
diff --git a/bin/ed/re.c b/bin/ed/re.c
index 989367c..65b25a2 100644
--- a/bin/ed/re.c
+++ b/bin/ed/re.c
@@ -24,12 +24,15 @@
  * 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.
- *
- *	$Id$
  */
 
 #ifndef lint
+#if 0
 static char * const rcsid = "@(#)re.c,v 1.6 1994/02/01 00:34:43 alm Exp";
+#else
+static char * const rcsid =
+	"$Id: re.c,v 1.13 1997/02/22 14:03:18 peter Exp $";
+#endif
 #endif /* not lint */
 
 #include "ed.h"
diff --git a/bin/ed/sub.c b/bin/ed/sub.c
index 79d17f2..3877b00 100644
--- a/bin/ed/sub.c
+++ b/bin/ed/sub.c
@@ -24,12 +24,15 @@
  * 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.
- *
- *	$Id$
  */
 
 #ifndef lint
+#if 0
 static char * const rcsid = "@(#)sub.c,v 1.1 1994/02/01 00:34:44 alm Exp";
+#else
+static char * const rcsid =
+	"$Id: sub.c,v 1.9 1997/02/22 14:03:19 peter Exp $";
+#endif
 #endif /* not lint */
 
 #include "ed.h"
diff --git a/bin/ed/undo.c b/bin/ed/undo.c
index 7023cd6..549a354 100644
--- a/bin/ed/undo.c
+++ b/bin/ed/undo.c
@@ -23,12 +23,15 @@
  * 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.
- *
- *	$Id$
  */
 
 #ifndef lint
+#if 0
 static char * const rcsid = "@(#)undo.c,v 1.1 1994/02/01 00:34:44 alm Exp";
+#else
+static char * const rcsid =
+	"$Id: undo.c,v 1.6 1997/02/22 14:03:20 peter Exp $";
+#endif
 #endif /* not lint */
 
 #include "ed.h"