I got confused and made the strength multiplier 20, it should be 10.

diff --git a/usr.bin/file/magic-load.c b/usr.bin/file/magic-load.c
index 9d4480d..c68d416 100644 (file)
--- a/usr.bin/file/magic-load.c
+++ b/usr.bin/file/magic-load.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: magic-load.c,v 1.4 2015/04/25 21:17:09 nicm Exp $ */
+/* $OpenBSD: magic-load.c,v 1.5 2015/05/29 14:15:41 nicm Exp $ */
 
 /*
  * Copyright (c) 2015 Nicholas Marriott <nicm@openbsd.org>
@@ -287,7 +287,7 @@ magic_get_strength(struct magic_line *ml)
        if (ml->test_not || ml->test_operator == 'x')
                return (1);
 
-       n = 20;
+       n = 2 * MAGIC_STRENGTH_MULTIPLIER;
        switch (ml->type) {
        case MAGIC_TYPE_NONE:
        case MAGIC_TYPE_DEFAULT:

diff --git a/usr.bin/file/magic.h b/usr.bin/file/magic.h
index 3ee8331..5095b7b 100644 (file)
--- a/usr.bin/file/magic.h
+++ b/usr.bin/file/magic.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: magic.h,v 1.5 2015/04/24 16:24:11 nicm Exp $ */
+/* $OpenBSD: magic.h,v 1.6 2015/05/29 14:15:41 nicm Exp $ */
 
 /*
  * Copyright (c) 2015 Nicholas Marriott <nicm@openbsd.org>
@@ -31,7 +31,7 @@
 #include <string.h>
 
 #define MAGIC_STRING_SIZE 31
-#define MAGIC_STRENGTH_MULTIPLIER 20
+#define MAGIC_STRENGTH_MULTIPLIER 10
 
 enum magic_type {
        MAGIC_TYPE_NONE = 0,