check for the right magic_version()

diff --git a/src/file.c b/src/file.c
index 251a6a04aee33a175dc904767f3aa88574896482..d9180bc8bbb93c223802d5015bedfa4a906d49c6 100644 (file)
--- a/src/file.c
+++ b/src/file.c
@@ -32,7 +32,7 @@
 #include "file.h"
 
 #ifndef        lint
-FILE_RCSID("@(#)$File: file.c,v 1.147 2012/10/31 14:01:28 christos Exp $")
+FILE_RCSID("@(#)$File: file.c,v 1.148 2012/11/21 16:27:39 christos Exp $")
 #endif /* lint */
 
 #include "magic.h"
@@ -276,6 +276,11 @@ main(int argc, char *argv[])
        if (e)
                return e;
 
+       if (MAGIC_VERSION != magic_version())
+               (void)fprintf(stderr, "%s: compiled magic version [%d] "
+                   "does not match with shared library magic version [%d]\n",
+                   progname, MAGIC_VERSION, magic_version());
+
        switch(action) {
        case FILE_CHECK:
        case FILE_COMPILE:

diff --git a/src/magic.c b/src/magic.c
index 14cd1547257030389dfa549f8f4e59bd8ae96a2b..4e36ec4ea5b698bd7e623d8831f08c014364f3e1 100644 (file)
--- a/src/magic.c
+++ b/src/magic.c
@@ -33,7 +33,7 @@
 #include "file.h"
 
 #ifndef        lint
-FILE_RCSID("@(#)$File: magic.c,v 1.76 2012/10/30 23:11:51 christos Exp $")
+FILE_RCSID("@(#)$File: magic.c,v 1.77 2012/10/31 17:20:06 christos Exp $")
 #endif /* lint */
 
 #include "magic.h"
@@ -477,3 +477,9 @@ magic_setflags(struct magic_set *ms, int flags)
        ms->flags = flags;
        return 0;
 }
+
+public int
+magic_version(void)
+{
+       return MAGIC_VERSION;
+}