*** empty log message ***

diff --git a/magic/Magdir/sun b/magic/Magdir/sun
index f6695f1faa278688692320891dcec8a255e7151b..450ea6a504cd4eec7bb6885a67a824587e669489 100644 (file)
--- a/magic/Magdir/sun
+++ b/magic/Magdir/sun
@@ -84,3 +84,13 @@
 >>128  string          >\0             from '%s'
 >4     belong          456             (SPARC 4.x BCP)
 >>152  string          >\0             from '%s'
+# Sun SunPC
+0      long            0xfa33c08e      SunPC 4.0 Hard Disk
+0      string          #SUNPC_CONFIG   SunPC 4.0 Properties Values
+# Sun snoop
+0      string          snoop           Snoop capture file
+>8     long            >0              - version %ld
+# Sun KCMS
+36     string          acsp            Kodak Color Management System, ICC Profile
+
+

diff --git a/magic/Magdir/varied.out b/magic/Magdir/varied.out
index 2d1c95658305e5b44a06490f9af236d3d37fb663..9245cfcbcc34bb3bb74f50bb7f1db41f6cf19511 100644 (file)
--- a/magic/Magdir/varied.out
+++ b/magic/Magdir/varied.out
@@ -13,3 +13,6 @@
 0      beshort         0160007         amd 29k coff archive
 # Cray
 6      beshort         0407            unicos (cray) executable
+# Ultrix 4.3
+596    string          \130\337\377\377        Ultrix core file
+>600   string          >\0     '%s'

diff --git a/src/fsmagic.c b/src/fsmagic.c
index 5e00c4f1146f63fb6fdd163266ce3c5795c53664..b34a89a25422a6045555a5dd8e8bde5edd94e392 100644 (file)
--- a/src/fsmagic.c
+++ b/src/fsmagic.c
@@ -31,6 +31,11 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <stdlib.h>
+#ifndef major
+# if defined(__SVR4) || defined(_SVR4_SOURCE)
+#  include <sys/mkdev.h>
+# endif
+#endif
 #ifndef        major                   /* if `major' not defined in types.h, */
 #include <sys/sysmacros.h>     /* try this one. */
 #endif
@@ -46,7 +51,7 @@
 
 #ifndef        lint
 static char *moduleid = 
-       "@(#)$Id: fsmagic.c,v 1.23 1995/01/21 21:03:35 christos Exp $";
+       "@(#)$Id: fsmagic.c,v 1.24 1996/08/20 01:51:40 christos Exp $";
 #endif /* lint */
 
 int