sync with NetBSD

diff --git a/magic/Magdir/amigaos b/magic/Magdir/amigaos
index 6073936e17bd1ce3d022a8e5c03762d903a8907c..a4c3e829542c719665e26781236a840d74aaac50 100644 (file)
--- 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 (file)
index 0000000..6d44794
--- /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 4b784870eda853c20fe9f90f9aa577386425e58b..53a6bc96ef35faa4a367ef16909980e1a72a1480 100644 (file)
--- 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 360a6825b703c43615d3db745e768a9011d11942..c14b3810758029b40b216457c482dd5577deb055 100644 (file)
--- 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 236591c23cd6756f0f1a6478e5a9a8dbfed67a60..8f957e3e3c6cf9680e711ffe98d77bea6ed33df9 100644 (file)
--- 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 1085dee4d693c89ca0287d22684ea8a45045c86a..fc9161543225c0d0738be3cd8e828b6b876c57f2 100644 (file)
--- 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 */