From: Christos Zoulas <christos@zoulas.com>
Date: Mon, 23 Jul 2001 00:02:32 +0000 (+0000)
Subject: sync with NetBSD
X-Git-Tag: FILE3_37~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e7deb553507b03e6f54829882ae009e648870eea;p=file

sync with NetBSD
---

diff --git a/magic/Magdir/amigaos b/magic/Magdir/amigaos
index 6073936e..a4c3e829 100644
--- a/magic/Magdir/amigaos
+++ b/magic/Magdir/amigaos
@@ -4,7 +4,7 @@
 #
 # From ignatios@cs.uni-bonn.de (Ignatios Souvatzis)
 # Some formats are still missing: AmigaOS special IFF's, e.g.: FORM....CTLG
-# (the others should be seperate, anyway)
+# (the others should be separate, anyway)
 #
 0	belong		0x000003f3	AmigaOS loadseg()ble executable/binary
 0	belong		0x000003e7	AmigaOS object/library data
diff --git a/magic/Magdir/citrus b/magic/Magdir/citrus
new file mode 100644
index 00000000..6d447945
--- /dev/null
+++ b/magic/Magdir/citrus
@@ -0,0 +1,6 @@
+#------------------------------------------------------------------------------
+# citrus locale declaration
+#
+
+0	string		RuneCT		Citrus locale declaration for LC_CTYPE
+
diff --git a/magic/Magdir/elf b/magic/Magdir/elf
index 4b784870..53a6bc96 100644
--- a/magic/Magdir/elf
+++ b/magic/Magdir/elf
@@ -85,6 +85,7 @@
 >>18	leshort		51		Stanford MIPS-X,
 >>18	leshort		52		Motorola Coldfire,
 >>18	leshort		53		Motorola M68HC12,
+>>18	leshort		62		AMD x86-64,
 >>18	leshort		75		Digital VAX,
 >>18	leshort		0x9026		Alpha (unofficial),
 >>20	lelong		0		invalid version
diff --git a/src/apprentice.c b/src/apprentice.c
index 360a6825..c14b3810 100644
--- a/src/apprentice.c
+++ b/src/apprentice.c
@@ -39,7 +39,7 @@
 #endif
 
 #ifndef	lint
-FILE_RCSID("@(#)$Id: apprentice.c,v 1.42 2001/07/22 21:04:15 christos Exp $")
+FILE_RCSID("@(#)$Id: apprentice.c,v 1.43 2001/07/23 00:02:32 christos Exp $")
 #endif	/* lint */
 
 #define	EATAB {while (isascii((unsigned char) *l) && \
@@ -330,7 +330,7 @@ parse(magicp, nmagicp, l, action)
 {
 	int i = 0;
 	struct magic *m;
-	char *t, *s;
+	char *t;
 
 #define ALLOC_INCR	200
 	if (*nmagicp + 1 >= maxmagic){
diff --git a/src/file.c b/src/file.c
index 236591c2..8f957e3e 100644
--- a/src/file.c
+++ b/src/file.c
@@ -56,7 +56,7 @@
 #include "patchlevel.h"
 
 #ifndef	lint
-FILE_RCSID("@(#)$Id: file.c,v 1.58 2001/07/22 21:04:15 christos Exp $")
+FILE_RCSID("@(#)$Id: file.c,v 1.59 2001/07/23 00:02:32 christos Exp $")
 #endif	/* lint */
 
 
@@ -131,7 +131,7 @@ main(argc, argv)
 	if ((usermagic = getenv("MAGIC")) != NULL)
 		magicfile = usermagic;
 	else
-		if (home = getenv("HOME")) {
+		if ((home = getenv("HOME")) != NULL) {
 			if ((usermagic = malloc(strlen(home) + 8)) != NULL) {
 				(void)strcpy(usermagic, home);
 				(void)strcat(usermagic, "/.magic");
diff --git a/src/softmagic.c b/src/softmagic.c
index 1085dee4..fc916154 100644
--- a/src/softmagic.c
+++ b/src/softmagic.c
@@ -35,7 +35,7 @@
 #include "file.h"
 
 #ifndef	lint
-FILE_RCSID("@(#)$Id: softmagic.c,v 1.45 2001/07/22 21:04:15 christos Exp $")
+FILE_RCSID("@(#)$Id: softmagic.c,v 1.46 2001/07/23 00:02:32 christos Exp $")
 #endif	/* lint */
 
 static int match	__P((struct magic *, uint32, unsigned char *, int));
@@ -214,10 +214,7 @@ mprint(p, m)
 	union VALUETYPE *p;
 	struct magic *m;
 {
-	char *pp, *rt;
-	char *oldtz, tz[16];
 	uint32 v;
-	time_t curtime;
 	int32 t=0 ;
 
 
@@ -390,7 +387,6 @@ mconvert(p, m)
 		return 1;
 	case STRING:
 		{
-			char *ptr;
 			int n;
 
 			/* Null terminate and eat *trailing* return */