clean up import

5 files changed, 43 insertions, 33 deletions

diff --git a/dm/Makefile b/dm/Makefile
index 721baf87..ba5ec823 100644
--- a/dm/Makefile
+++ b/dm/Makefile
@@ -1,9 +1,10 @@
-#	from: @(#)Makefile	5.7 (Berkeley) 9/30/90
-#	$Id: Makefile,v 1.6 1994/12/22 09:33:58 cgd Exp $
+#	$NetBSD: Makefile,v 1.7 1995/03/21 15:09:02 cgd Exp $
+#	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
 # -DLOG		log games
 PROG=	dm
 MAN=	dm.8 dm.conf.5
+# shouldn't be necessary; just in case.
 BINOWN= games
 BINMODE=4555
 
diff --git a/dm/dm.8 b/dm/dm.8
index d0ebb5af..69ac9621 100644
--- a/dm/dm.8
+++ b/dm/dm.8
@@ -1,5 +1,7 @@
-.\" Copyright (c) 1987, 1991 Regents of the University of California.
-.\" All rights reserved.
+.\"	$NetBSD: dm.8,v 1.3 1995/03/21 15:09:04 cgd Exp $
+.\"
+.\" Copyright (c) 1987, 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -29,10 +31,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)dm.8	5.11 (Berkeley) 7/23/91
-.\"	$Id: dm.8,v 1.2 1993/08/01 07:47:10 mycroft Exp $
+.\"     @(#)dm.8	8.1 (Berkeley) 5/31/93
 .\"
-.Dd July 23, 1991
+.Dd May 31, 1993
 .Dt DM 8
 .Os
 .Sh NAME
diff --git a/dm/dm.c b/dm/dm.c
index 11dedb0d..7dd82ef9 100644
--- a/dm/dm.c
+++ b/dm/dm.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: dm.c,v 1.4 1995/03/21 15:09:05 cgd Exp $	*/
+
 /*
- * Copyright (c) 1987 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1987, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,26 +34,33 @@
  */
 
 #ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1987 Regents of the University of California.\n\
- All rights reserved.\n";
+static char copyright[] =
+"@(#) Copyright (c) 1987, 1993\n\
+	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)dm.c	5.16 (Berkeley) 2/28/91";*/
-static char rcsid[] = "$Id: dm.c,v 1.3 1993/08/01 18:55:03 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)dm.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: dm.c,v 1.4 1995/03/21 15:09:05 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include <sys/param.h>
 #include <sys/file.h>
 #include <sys/time.h>
 #include <sys/resource.h>
-#include <pwd.h>
-#include <utmp.h>
+
+#include <ctype.h>
 #include <nlist.h>
+#include <pwd.h>
 #include <stdio.h>
-#include <ctype.h>
 #include <string.h>
+#include <time.h>
+#include <unistd.h>
+#include <utmp.h>
+
 #include "pathnames.h"
 
 extern int errno;
@@ -60,13 +69,12 @@ static int	priority = 0;		/* priority game runs at */
 static char	*game,			/* requested game */
 		*gametty;		/* from tty? */
 
-/*ARGSUSED*/
+int
 main(argc, argv)
 	int argc;
-	char **argv;
+	char *argv[];
 {
-	char *cp, *rindex(), *ttyname();
-	time_t time();
+	char *cp;
 
 	nogamefile();
 	game = (cp = rindex(*argv, '/')) ? ++cp : *argv;
@@ -178,7 +186,6 @@ c_tty(tty)
 {
 	static int first = 1;
 	static char *p_tty;
-	char *rindex();
 
 	if (first) {
 		p_tty = rindex(gametty, '/');
@@ -300,11 +307,10 @@ hour(h)
  */
 logfile()
 {
-	struct passwd *pw, *getpwuid();
+	struct passwd *pw;
 	FILE *lp;
 	uid_t uid;
 	int lock_cnt;
-	char *ctime();
 
 	if (lp = fopen(_PATH_LOG, "a")) {
 		for (lock_cnt = 0;; ++lock_cnt) {
diff --git a/dm/dm.conf.5 b/dm/dm.conf.5
index 561d0c8d..53a7a4df 100644
--- a/dm/dm.conf.5
+++ b/dm/dm.conf.5
@@ -1,5 +1,7 @@
-.\" Copyright (c) 1988, 1991 Regents of the University of California.
-.\" All rights reserved.
+.\"	$NetBSD: dm.conf.5,v 1.3 1995/03/21 15:09:07 cgd Exp $
+.\"
+.\" Copyright (c) 1988, 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -29,10 +31,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)dm.conf.5	5.8 (Berkeley) 5/10/91
-.\"	$Id: dm.conf.5,v 1.2 1993/08/01 07:47:09 mycroft Exp $
+.\"     @(#)dm.conf.5	8.1 (Berkeley) 5/31/93
 .\"
-.Dd May 10, 1991
+.Dd May 31, 1993
 .Dt DM.CONF 5
 .Os BSD 4.2
 .Sh NAME
diff --git a/dm/pathnames.h b/dm/pathnames.h
index bf016f51..0b667aa8 100644
--- a/dm/pathnames.h
+++ b/dm/pathnames.h
@@ -1,6 +1,8 @@
+/*	$NetBSD: pathnames.h,v 1.3 1995/03/21 15:09:08 cgd Exp $	*/
+
 /*
- * Copyright (c) 1989 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1989, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -30,8 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)pathnames.h	5.3 (Berkeley) 6/26/90
- *	$Id: pathnames.h,v 1.2 1993/08/01 18:55:02 mycroft Exp $
+ *	@(#)pathnames.h	8.1 (Berkeley) 5/31/93
  */
 
 #define	_PATH_CONFIG	"/etc/dm.conf"