From: Mike Frysinger <vapier@gentoo.org>
Date: Sat, 7 Jun 2008 17:22:45 +0000 (-0400)
Subject: more: dont use a.out.h
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9eb4dad0ece03914f67f6d1ded74cfbbe694ba4;p=util-linux

more: dont use a.out.h

The a.out.h header is not friendly to portable systems (iow, those that
lack a.out support), and since the defines are only used in a cheesy magic,
just use the magic constants.  It's not like they're ever going to change.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---

diff --git a/text-utils/more.c b/text-utils/more.c
index f251b279..45a58e27 100644
--- a/text-utils/more.c
+++ b/text-utils/more.c
@@ -54,7 +54,6 @@
 #include <sys/stat.h>
 #include <sys/file.h>
 #include <sys/wait.h>
-#include <a.out.h>
 #include "xstrncpy.h"
 #include "nls.h"
 #include "widechar.h"
@@ -546,9 +545,9 @@ magic(f, fs)
 
 	if (fread(twobytes, 2, 1, f) == 1) {
 		switch(twobytes[0] + (twobytes[1]<<8)) {
-		case OMAGIC:	/* 0407 */
-		case NMAGIC:	/* 0410 */
-		case ZMAGIC:	/* 0413 */
+		case 0407:	/* a.out obj */
+		case 0410:	/* a.out exec */
+		case 0413:	/* a.out demand exec */
 		case 0405:
 		case 0411:
 		case 0177545: