Build under OpenBSD. Added OpenBSD tags. Cleanup manpage.

4 files changed, 9 insertions, 5 deletions

diff --git a/usr.bin/more/Makefile b/usr.bin/more/Makefile
index 9430b789f20..6428f621c0c 100644
--- a/usr.bin/more/Makefile
+++ b/usr.bin/more/Makefile
@@ -1,3 +1,4 @@
+#	$OpenBSD: Makefile,v 1.4 1996/09/28 22:20:48 etheisen Exp $
 #	@(#)Makefile	5.11 (Berkeley) 6/25/90
 
 PROG=	more
diff --git a/usr.bin/more/more.1 b/usr.bin/more/more.1
index e2939fa80a5..044960b6ff7 100644
--- a/usr.bin/more/more.1
+++ b/usr.bin/more/more.1
@@ -1,3 +1,4 @@
+.\"	$OpenBSD: more.1,v 1.4 1996/09/28 22:20:48 etheisen Exp $
 .\" Copyright (c) 1980 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -159,7 +160,7 @@ is the number of lines the terminal can display.
 .PP
 .I More
 looks in the file
-.I /etc/termcap
+.I /usr/share/misc/termcap
 to determine terminal characteristics,
 and to determine the default window size.
 On a terminal capable of displaying 24 lines,
@@ -347,9 +348,9 @@ output would be
 	nroff \-ms +2 doc.n | more -s
 .SH FILES
 .DT
-/etc/termcap		Terminal data base
+/usr/share/misc/termcap		Terminal data base
 .br
-/usr/lib/more.help	Help file
+/usr/share/misc/more.help	Help file
 .SH "SEE ALSO"
 csh(1), man(1), msgs(1), script(1), sh(1), environ(7)
 .SH BUGS
diff --git a/usr.bin/more/more.c b/usr.bin/more/more.c
index ae69894203e..5e241c47dce 100644
--- a/usr.bin/more/more.c
+++ b/usr.bin/more/more.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: more.c,v 1.2 1996/09/28 22:20:49 etheisen Exp $	*/
 /*-
  * Copyright (c) 1980 The Regents of the University of California.
  * All rights reserved.
@@ -407,7 +408,7 @@ magic(f, fs)
 	struct exec ex;
 
 	if (fread(&ex, sizeof(ex), 1, f) == 1)
-		switch(ex.a_magic) {
+		switch(N_GETMAGIC(ex)) {
 		case OMAGIC:
 		case NMAGIC:
 		case ZMAGIC:
diff --git a/usr.bin/more/pathnames.h b/usr.bin/more/pathnames.h
index 296d60aba3e..78c0a158d9a 100644
--- a/usr.bin/more/pathnames.h
+++ b/usr.bin/more/pathnames.h
@@ -1,3 +1,4 @@
+/*	$OpenBSD: pathnames.h,v 1.4 1996/09/28 22:20:49 etheisen Exp $	*/
 /*-
  * Copyright (c) 1989 The Regents of the University of California.
  * All rights reserved.
@@ -35,4 +36,4 @@
 
 #include <paths.h>
 
-#define	HELPFILE	"/usr/share/misc/omore.help"
+#define	HELPFILE	"/usr/share/misc/more.help"