Apply Debian code patches from Debian package 5.04-6.

diff --git a/python/py_magic.c b/python/py_magic.c
index 46562e6e2bc36bfaf82c7d1d0d180424b0074f28..10a1b3807767752e19f34d0ff05ba7c0184264b3 100644 (file)
--- a/python/py_magic.c
+++ b/python/py_magic.c
@@ -303,11 +303,24 @@ static struct const_vals {
     { "MAGIC_SYMLINK", MAGIC_SYMLINK },
     { "MAGIC_COMPRESS", MAGIC_COMPRESS },
     { "MAGIC_DEVICES", MAGIC_DEVICES },
-    { "MAGIC_MIME", MAGIC_MIME },
+    { "MAGIC_MIME_TYPE", MAGIC_MIME_TYPE },
     { "MAGIC_CONTINUE", MAGIC_CONTINUE },
     { "MAGIC_CHECK", MAGIC_CHECK },
     { "MAGIC_PRESERVE_ATIME", MAGIC_PRESERVE_ATIME },
+    { "MAGIC_RAW", MAGIC_RAW},
     { "MAGIC_ERROR", MAGIC_ERROR},
+    { "MAGIC_MIME_ENCODING", MAGIC_MIME_ENCODING },
+    { "MAGIC_MIME", MAGIC_MIME },
+    { "MAGIC_APPLE", MAGIC_APPLE },
+    { "MAGIC_NO_CHECK_COMPRESS", MAGIC_NO_CHECK_COMPRESS },
+    { "MAGIC_NO_CHECK_TAR", MAGIC_NO_CHECK_TAR },
+    { "MAGIC_NO_CHECK_SOFT", MAGIC_NO_CHECK_SOFT },
+    { "MAGIC_NO_CHECK_APPTYPE", MAGIC_NO_CHECK_APPTYPE },
+    { "MAGIC_NO_CHECK_ELF", MAGIC_NO_CHECK_ELF },
+    { "MAGIC_NO_CHECK_TEXT", MAGIC_NO_CHECK_TEXT },
+    { "MAGIC_NO_CHECK_CDF", MAGIC_NO_CHECK_CDF },
+    { "MAGIC_NO_CHECK_TOKENS", MAGIC_NO_CHECK_TOKENS },
+    { "MAGIC_NO_CHECK_ENCODING", MAGIC_NO_CHECK_ENCODING },
     { NULL }
 };
 

diff --git a/src/fsmagic.c b/src/fsmagic.c
index 2aa5a768de96cbd7dc632775b217a23e987ca8c5..8532d089a65b6a7588589041f5c12893d917c084 100644 (file)
--- a/src/fsmagic.c
+++ b/src/fsmagic.c
@@ -32,7 +32,7 @@
 #include "file.h"
 
 #ifndef        lint
-FILE_RCSID("@(#)$File: fsmagic.c,v 1.60 2009/05/08 17:41:59 christos Exp $")
+FILE_RCSID("@(#)$File: fsmagic.c,v 1.61 2010/07/21 16:47:17 christos Exp $")
 #endif /* lint */
 
 #include "magic.h"
@@ -134,7 +134,8 @@ file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb)
                if (file_printf(ms, "cannot open `%s' (%s)",
                    fn, strerror(errno)) == -1)
                        return -1;
-               return 1;
+               ms->event_flags |= EVENT_HAD_ERR;
+               return -1;
        }
 
        if (!mime) {