Partial revert of 1a7798c786466977ef8d2bc95b40a435c47c845a that introduced wrong...

diff --git a/ext/fileinfo/libmagic/softmagic.c b/ext/fileinfo/libmagic/softmagic.c
index e08d167f9e6815e872d43c145c4204ac62d69d46..3fd30ff42cfabbd8d35ccc6388129f31fe51e4a0 100644 (file)
--- a/ext/fileinfo/libmagic/softmagic.c
+++ b/ext/fileinfo/libmagic/softmagic.c
@@ -624,7 +624,6 @@ mprint(struct magic_set *ms, struct magic *m)
                t = ms->offset + sizeof(double);
                break;
 
-       case FILE_SEARCH:
        case FILE_REGEX: {
                char *cp;
                int rval;
@@ -648,6 +647,15 @@ mprint(struct magic_set *ms, struct magic *m)
                break;
        }
 
+       case FILE_SEARCH:
+               if (file_printf(ms, F(ms, m, "%s"), m->value.s) == -1)
+                       return -1;
+               if ((m->str_flags & REGEX_OFFSET_START))
+                       t = ms->search.offset;
+               else
+                       t = ms->search.offset + m->vallen;
+               break;
+
        case FILE_DEFAULT:
        case FILE_CLEAR:
                if (file_printf(ms, "%s", m->desc) == -1)