- print the line number of the rule

- add missing flags

diff --git a/src/print.c b/src/print.c
index 23a7708d4f644a63cf8213306bff5aee45abc911..c996781f9ac3af2233958ecc9b5d1d3cf6df9292 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -32,7 +32,7 @@
 #include "file.h"
 
 #ifndef lint
-FILE_RCSID("@(#)$File: print.c,v 1.69 2010/07/21 16:47:18 christos Exp $")
+FILE_RCSID("@(#)$File: print.c,v 1.70 2011/08/14 09:03:12 christos Exp $")
 #endif  /* lint */
 
 #include <string.h>
@@ -51,8 +51,8 @@ file_mdump(struct magic *m)
 {
        private const char optyp[] = { FILE_OPS };
 
-       (void) fprintf(stderr, "%.*s %u", (m->cont_level & 7) + 1, ">>>>>>>>",
-                      m->offset);
+       (void) fprintf(stderr, "%u: %.*s %u", m->lineno,
+           (m->cont_level & 7) + 1, ">>>>>>>>", m->offset);
 
        if (m->flag & INDIR) {
                (void) fprintf(stderr, "(%s,",
@@ -87,6 +87,24 @@ file_mdump(struct magic *m)
                                (void) fputc(CHAR_IGNORE_UPPERCASE, stderr);
                        if (m->str_flags & REGEX_OFFSET_START) 
                                (void) fputc(CHAR_REGEX_OFFSET_START, stderr);
+                       if (m->str_flags & STRING_TEXTTEST)
+                               (void) fputc(CHAR_TEXTTEST, stderr);
+                       if (m->str_flags & STRING_BINTEST)
+                               (void) fputc(CHAR_BINTEST, stderr);
+                       if (m->str_flags & PSTRING_1_BE)
+                               (void) fputc(CHAR_PSTRING_1_BE, stderr);
+                       if (m->str_flags & PSTRING_2_BE)
+                               (void) fputc(CHAR_PSTRING_2_BE, stderr);
+                       if (m->str_flags & PSTRING_2_LE)
+                               (void) fputc(CHAR_PSTRING_2_LE, stderr);
+                       if (m->str_flags & PSTRING_4_BE)
+                               (void) fputc(CHAR_PSTRING_4_BE, stderr);
+                       if (m->str_flags & PSTRING_4_LE)
+                               (void) fputc(CHAR_PSTRING_4_LE, stderr);
+                       if (m->str_flags & PSTRING_LENGTH_INCLUDES_ITSELF)
+                               (void) fputc(
+                                   CHAR_PSTRING_LENGTH_INCLUDES_ITSELF,
+                                   stderr);
                }
                if (m->str_range)
                        (void) fprintf(stderr, "/%u", m->str_range);