From 8ddb734554a1f450dbc18cd1ee7ffce70ad5a945 Mon Sep 17 00:00:00 2001
From: tls <tls@NetBSD.org>
Date: Thu, 28 Sep 1995 05:37:28 +0000
Subject: [PATCH] Sync with 4.4BSD-Lite2

---
 usr.bin/m4/TEST/ack.m4    | 1 +
 usr.bin/m4/TEST/hanoi.m4  | 1 +
 usr.bin/m4/TEST/hash.m4   | 1 +
 usr.bin/m4/TEST/sqroot.m4 | 1 +
 usr.bin/m4/TEST/string.m4 | 1 +
 usr.bin/m4/TEST/test.m4   | 1 +
 usr.bin/m4/eval.c         | 8 +++++++-
 usr.bin/m4/expr.c         | 8 +++++++-
 usr.bin/m4/extern.h       | 2 ++
 usr.bin/m4/main.c         | 6 ++++++
 usr.bin/m4/mdef.h         | 2 ++
 usr.bin/m4/misc.c         | 6 ++++++
 usr.bin/m4/pathnames.h    | 4 +++-
 usr.bin/m4/serv.c         | 6 ++++++
 usr.bin/m4/stdd.h         | 2 ++
 15 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/usr.bin/m4/TEST/ack.m4 b/usr.bin/m4/TEST/ack.m4
index de914bdcb469..2784c45b5959 100644
--- a/usr.bin/m4/TEST/ack.m4
+++ b/usr.bin/m4/TEST/ack.m4
@@ -1,3 +1,4 @@
+#	$NetBSD: ack.m4,v 1.4 1995/09/28 05:37:54 tls Exp $
 #
 # Copyright (c) 1989, 1993
 #	The Regents of the University of California.  All rights reserved.
diff --git a/usr.bin/m4/TEST/hanoi.m4 b/usr.bin/m4/TEST/hanoi.m4
index 9371b3477535..6f7343104fb2 100644
--- a/usr.bin/m4/TEST/hanoi.m4
+++ b/usr.bin/m4/TEST/hanoi.m4
@@ -1,3 +1,4 @@
+#	$NetBSD: hanoi.m4,v 1.4 1995/09/28 05:37:56 tls Exp $
 #
 # Copyright (c) 1989, 1993
 #	The Regents of the University of California.  All rights reserved.
diff --git a/usr.bin/m4/TEST/hash.m4 b/usr.bin/m4/TEST/hash.m4
index 85d5aa844638..5de2f79bbf6d 100644
--- a/usr.bin/m4/TEST/hash.m4
+++ b/usr.bin/m4/TEST/hash.m4
@@ -1,3 +1,4 @@
+#	$NetBSD: hash.m4,v 1.4 1995/09/28 05:37:58 tls Exp $
 #
 # Copyright (c) 1989, 1993
 #	The Regents of the University of California.  All rights reserved.
diff --git a/usr.bin/m4/TEST/sqroot.m4 b/usr.bin/m4/TEST/sqroot.m4
index 3c7501fa796d..6fc8d2c73c8b 100644
--- a/usr.bin/m4/TEST/sqroot.m4
+++ b/usr.bin/m4/TEST/sqroot.m4
@@ -1,3 +1,4 @@
+#	$NetBSD: sqroot.m4,v 1.4 1995/09/28 05:38:01 tls Exp $
 #
 # Copyright (c) 1989, 1993
 #	The Regents of the University of California.  All rights reserved.
diff --git a/usr.bin/m4/TEST/string.m4 b/usr.bin/m4/TEST/string.m4
index bff741a07fb7..a14f14a2035f 100644
--- a/usr.bin/m4/TEST/string.m4
+++ b/usr.bin/m4/TEST/string.m4
@@ -1,3 +1,4 @@
+#	$NetBSD: string.m4,v 1.4 1995/09/28 05:38:03 tls Exp $
 #
 # Copyright (c) 1989, 1993
 #	The Regents of the University of California.  All rights reserved.
diff --git a/usr.bin/m4/TEST/test.m4 b/usr.bin/m4/TEST/test.m4
index df8b78c45f75..5b198073aa8c 100644
--- a/usr.bin/m4/TEST/test.m4
+++ b/usr.bin/m4/TEST/test.m4
@@ -1,3 +1,4 @@
+#	$NetBSD: test.m4,v 1.4 1995/09/28 05:38:05 tls Exp $
 #
 # Copyright (c) 1989, 1993
 #	The Regents of the University of California.  All rights reserved.
diff --git a/usr.bin/m4/eval.c b/usr.bin/m4/eval.c
index 81c2eb1ee736..a59c3095c083 100644
--- a/usr.bin/m4/eval.c
+++ b/usr.bin/m4/eval.c
@@ -1,3 +1,5 @@
+/*      $NetBSD: eval.c,v 1.4 1995/09/28 05:37:28 tls Exp $      */
+
 /*
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -35,7 +37,11 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)eval.c	8.1 (Berkeley) 6/6/93";
+#if 0
+static char sccsid[] = "@(#)eval.c	8.2 (Berkeley) 4/27/95";
+#else
+static char rcsid[] = "$NetBSD: eval.c,v 1.4 1995/09/28 05:37:28 tls Exp $";
+#endif
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/m4/expr.c b/usr.bin/m4/expr.c
index 9272f6bfe993..5383da1f695a 100644
--- a/usr.bin/m4/expr.c
+++ b/usr.bin/m4/expr.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: expr.c,v 1.7 1995/09/28 05:37:31 tls Exp $	*/
+
 /*
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -35,7 +37,11 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)expr.c	8.1 (Berkeley) 6/6/93";
+#if 0
+static char sccsid[] = "@(#)expr.c	8.2 (Berkeley) 4/29/95";
+#else
+static char rcsid[] = "$NetBSD: expr.c,v 1.7 1995/09/28 05:37:31 tls Exp $";
+#endif
 #endif /* not lint */
 
 #include <sys/cdefs.h>
diff --git a/usr.bin/m4/extern.h b/usr.bin/m4/extern.h
index b54a9b975a9c..1b33741de555 100644
--- a/usr.bin/m4/extern.h
+++ b/usr.bin/m4/extern.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: extern.h,v 1.2 1995/09/28 05:37:34 tls Exp $	*/
+
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/usr.bin/m4/main.c b/usr.bin/m4/main.c
index 221b865a9b64..50eca50e33ec 100644
--- a/usr.bin/m4/main.c
+++ b/usr.bin/m4/main.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: main.c,v 1.9 1995/09/28 05:37:36 tls Exp $	*/
+
 /*-
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -41,7 +43,11 @@ static char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/6/93";
+#else
+static char rcsid[] = "$NetBSD: main.c,v 1.9 1995/09/28 05:37:36 tls Exp $";
+#endif
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/m4/mdef.h b/usr.bin/m4/mdef.h
index cc256b012b3e..110cc5b67dcb 100644
--- a/usr.bin/m4/mdef.h
+++ b/usr.bin/m4/mdef.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: mdef.h,v 1.6 1995/09/28 05:37:39 tls Exp $	*/
+
 /*
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/usr.bin/m4/misc.c b/usr.bin/m4/misc.c
index 2ed115bac4c6..7be00f42d664 100644
--- a/usr.bin/m4/misc.c
+++ b/usr.bin/m4/misc.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: misc.c,v 1.6 1995/09/28 05:37:41 tls Exp $	*/
+
 /*
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -35,7 +37,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 6/6/93";
+#else
+static char rcsid[] = "$NetBSD: misc.c,v 1.6 1995/09/28 05:37:41 tls Exp $";
+#endif
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/m4/pathnames.h b/usr.bin/m4/pathnames.h
index b0dcce7a3e35..e0106a4b34cf 100644
--- a/usr.bin/m4/pathnames.h
+++ b/usr.bin/m4/pathnames.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: pathnames.h,v 1.5 1995/09/28 05:37:44 tls Exp $	*/
+
 /*
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -46,7 +48,7 @@
 #define	UNIQUE		3			/* unique char location */
 #endif
 
-#if defined(unix) || defined(__NetBSD__)
+#if defined (unix) || defined(BSD)
 #define _PATH_DIVNAME	"/tmp/m4.0XXXXXX"	/* unix diversion files */
 #define UNIQUE		8			/* unique char location */
 #endif
diff --git a/usr.bin/m4/serv.c b/usr.bin/m4/serv.c
index 54a2e59dce40..e7c375f4f2d8 100644
--- a/usr.bin/m4/serv.c
+++ b/usr.bin/m4/serv.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: serv.c,v 1.7 1995/09/28 05:37:47 tls Exp $	*/
+
 /*
  * Copyright (c) 1989
  *	The Regents of the University of California.  All rights reserved.
@@ -40,7 +42,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)serv.c	5.4 (Berkeley) 1/21/94";
+#else
+static char rcsid[] = "$NetBSD: serv.c,v 1.7 1995/09/28 05:37:47 tls Exp $";
+#endif
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/m4/stdd.h b/usr.bin/m4/stdd.h
index 16c2840301b0..f27fa789adb2 100644
--- a/usr.bin/m4/stdd.h
+++ b/usr.bin/m4/stdd.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: stdd.h,v 1.2 1995/09/28 05:37:50 tls Exp $	*/
+
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.