[PATCH] more: dont use a.out.h

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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@xxxxxxxxxx>
---
 text-utils/more.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/text-utils/more.c b/text-utils/more.c
index dc38ff2..41078d1 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:
-- 
1.5.5.3

--
To unsubscribe from this list: send the line "unsubscribe util-linux-ng" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Netdev]     [Ethernet Bridging]     [Linux Wireless]     [Kernel Newbies]     [Security]     [Linux for Hams]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux RAID]     [Linux Admin]     [Samba]

  Powered by Linux