<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[118485] trunk/dports/sysutils/file</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/118485">118485</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2014-04-03 01:36:53 -0700 (Thu, 03 Apr 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>file: fix some problems in 5.18, and remove our custom modification to an MS Word MIME type (#41069)</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssysutilsfilePortfile">trunk/dports/sysutils/file/Portfile</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportssysutilsfilefilespatchpost518diff">trunk/dports/sysutils/file/files/patch-post-518.diff</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportssysutilsfilefilespatchmagicMagdirmsdosdiff">trunk/dports/sysutils/file/files/patch-magic-Magdir-msdos.diff</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssysutilsfilePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/sysutils/file/Portfile (118484 => 118485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/sysutils/file/Portfile        2014-04-03 07:01:53 UTC (rev 118484)
+++ trunk/dports/sysutils/file/Portfile        2014-04-03 08:36:53 UTC (rev 118485)
</span><span class="lines">@@ -5,6 +5,7 @@
</span><span class="cx"> 
</span><span class="cx"> name                file
</span><span class="cx"> version             5.18
</span><ins>+revision            1
</ins><span class="cx"> categories          sysutils
</span><span class="cx"> license             BSD
</span><span class="cx"> maintainers         ryandesign openmaintainer
</span><span class="lines">@@ -29,7 +30,7 @@
</span><span class="cx"> checksums           rmd160  c344ed01498fbd57e5840d81378de155ad2d8876 \
</span><span class="cx">                     sha256  6519fb706d583231c2419592ebecdbb21d33c62eaf7a1a0b24ddfcb80c08bf07
</span><span class="cx"> 
</span><del>-patchfiles          patch-magic-Magdir-msdos.diff \
</del><ins>+patchfiles          patch-post-518.diff \
</ins><span class="cx">                     patch-magic-Makefile.am.diff \
</span><span class="cx">                     patch-getline.diff
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkdportssysutilsfilefilespatchmagicMagdirmsdosdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/sysutils/file/files/patch-magic-Magdir-msdos.diff (118484 => 118485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/sysutils/file/files/patch-magic-Magdir-msdos.diff        2014-04-03 07:01:53 UTC (rev 118484)
+++ trunk/dports/sysutils/file/files/patch-magic-Magdir-msdos.diff        2014-04-03 08:36:53 UTC (rev 118485)
</span><span class="lines">@@ -1,15 +0,0 @@
</span><del>---- magic/Magdir/msdos.orig        2011-06-06 06:01:41.000000000 -0700
-+++ magic/Magdir/msdos        2011-08-18 15:59:01.000000000 -0700
-@@ -833,8 +833,11 @@
- 0        string        \224\246\056                Microsoft Word Document
- !:mime        application/msword

-+## this is not completely accurate, there are Excel documents that have the same pattern
-+## 512        string        R\0o\0o\0t\0\ \0E\0n\0t\0r\0y        Microsoft Word Document
-+## !:mime        application/msword
- 512        string        R\0o\0o\0t\0\ \0E\0n\0t\0r\0y        Microsoft Word Document
--!:mime        application/msword
-+!:mime        application/x-msoffice

- # From: &quot;Nelson A. de Oliveira&quot; &lt;naoliv@gmail.com&gt;
- # Magic type for Dell's BIOS .hdr files
</del></span></pre></div>
<a id="trunkdportssysutilsfilefilespatchpost518diff"></a>
<div class="addfile"><h4>Added: trunk/dports/sysutils/file/files/patch-post-518.diff (0 => 118485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/sysutils/file/files/patch-post-518.diff                                (rev 0)
+++ trunk/dports/sysutils/file/files/patch-post-518.diff        2014-04-03 08:36:53 UTC (rev 118485)
</span><span class="lines">@@ -0,0 +1,397 @@
</span><ins>+Post-5.18 fixes, will be included in 5.19
+
+--- ChangeLog        26 Mar 2014 15:28:41 -0000        1.225
++++ ChangeLog        1 Apr 2014 15:57:45 -0000        1.226
+@@ -1,3 +1,12 @@
++2014-04-01  15:25  Christos Zoulas &lt;christos@zoulas.com&gt;
++
++        * PR/341: Jan Kaluza, fix memory leak
++        * PR/342: Jan Kaluza, fix out of bounds read
++
++2014-03-28  15:25  Christos Zoulas &lt;christos@zoulas.com&gt;
++
++        * Fix issue with long formats not matching fmtcheck
++
+ 2014-03-26  11:25  Christos Zoulas &lt;christos@zoulas.com&gt;

+         * release 5.18
+Index: magic/Magdir/images
+===================================================================
+RCS file: /p/file/cvsroot/file/magic/Magdir/images,v
+retrieving revision 1.87
+retrieving revision 1.88
+diff -u -r1.87 -r1.88
+--- magic/Magdir/images        11 Dec 2013 14:14:20 -0000        1.87
++++ magic/Magdir/images        30 Mar 2014 21:41:45 -0000        1.88
+@@ -1,6 +1,6 @@

+ #------------------------------------------------------------------------------
+-# $File: images,v 1.87 2013/12/11 14:14:20 christos Exp $
++# $File: images,v 1.88 2014/03/30 21:41:45 christos Exp $
+ # images:  file(1) magic for image formats (see also &quot;iff&quot;, and &quot;c-lang&quot; for
+ # XPM bitmaps)
+ #
+@@ -18,14 +18,17 @@
+ # `xv' recognizes only a subset of the following (RGB with pixelsize = 24)
+ # `tgatoppm' recognizes a superset (Index may be anything)
+ 1        belong&amp;0xfff7ffff        0x01010000        Targa image data - Map
++!:strength + 2
+ &gt;2        byte&amp;8                        8                - RLE
+ &gt;12        leshort                        &gt;0                %hd x
+ &gt;14        leshort                        &gt;0                %hd
+ 1        belong&amp;0xfff7ffff        0x00020000        Targa image data - RGB
++!:strength + 2
+ &gt;2        byte&amp;8                        8                - RLE
+ &gt;12        leshort                        &gt;0                %hd x
+ &gt;14        leshort                        &gt;0                %hd
+ 1        belong&amp;0xfff7ffff        0x00030000        Targa image data - Mono
++!:strength + 2
+ &gt;2        byte&amp;8                        8                - RLE
+ &gt;12        leshort                        &gt;0                %hd x
+ &gt;14        leshort                        &gt;0                %hd
+Index: magic/Magdir/msdos
+===================================================================
+RCS file: /p/file/cvsroot/file/magic/Magdir/msdos,v
+retrieving revision 1.92
+retrieving revision 1.94
+diff -u -r1.92 -r1.94
+--- magic/Magdir/msdos        14 Mar 2014 18:47:29 -0000        1.92
++++ magic/Magdir/msdos        30 Mar 2014 21:41:45 -0000        1.94
+@@ -1,6 +1,6 @@

+ #------------------------------------------------------------------------------
+-# $File: msdos,v 1.92 2014/03/14 18:47:29 christos Exp $
++# $File: msdos,v 1.94 2014/03/30 21:41:45 christos Exp $
+ # msdos:  file(1) magic for MS-DOS files
+ #

+@@ -590,7 +590,6 @@
+ &gt;4  ubyte   !0  \b, %d colors

+ 0   belong  0x00000100
+-
+ &gt;9  byte    0
+ &gt;&gt;0 byte    x           MS Windows icon resource
+ !:mime        image/x-icon
+Index: magic/Magdir/palm
+===================================================================
+RCS file: /p/file/cvsroot/file/magic/Magdir/palm,v
+retrieving revision 1.11
+retrieving revision 1.13
+diff -u -r1.11 -r1.13
+--- magic/Magdir/palm        31 Dec 2013 19:18:02 -0000        1.11
++++ magic/Magdir/palm        30 Mar 2014 21:40:08 -0000        1.13
+@@ -1,6 +1,6 @@

+ #------------------------------------------------------------------------------
+-# $File: palm,v 1.11 2013/12/31 19:18:02 christos Exp $
++# $File: palm,v 1.13 2014/03/30 21:40:08 christos Exp $
+ # palm:         file(1) magic for PalmOS {.prc,.pdb}: applications, docfiles, and hacks
+ #
+ # Brian Lalor &lt;blalor@hcirisc.cs.binghamton.edu&gt;
+@@ -141,8 +141,12 @@
+ &gt;&gt;(0x4E.L+1)        byte                x                %02d)

+ # Palm OS .prc file types
+-60                string                libr                Palm OS dynamic library data
+-&gt;0                string                &gt;\0                &quot;%s&quot;
++60                string                libr
++# flags, only bit 0 or bit 6
++# http://en.wikipedia.org/wiki/PRC_%28Palm_OS%29
++# http://web.mit.edu/tytso/www/pilot/prc-format.html
++&gt;0x20                beshort&amp;0xffbe        0
++&gt;&gt;0                string                &gt;\0                Palm OS dynamic library data &quot;%s&quot;
+ 60                string                ptch                Palm OS operating system patch data
+ &gt;0                string                &gt;\0                &quot;%s&quot;

+Index: src/apprentice.c
+===================================================================
+RCS file: /p/file/cvsroot/file/src/apprentice.c,v
+retrieving revision 1.202
+retrieving revision 1.203
+diff -u -r1.202 -r1.203
+--- src/apprentice.c        14 Mar 2014 18:48:11 -0000        1.202
++++ src/apprentice.c        1 Apr 2014 15:57:28 -0000        1.203
+@@ -32,7 +32,7 @@
+ #include &quot;file.h&quot;

+ #ifndef        lint
+-FILE_RCSID(&quot;@(#)$File: apprentice.c,v 1.202 2014/03/14 18:48:11 christos Exp $&quot;)
++FILE_RCSID(&quot;@(#)$File: apprentice.c,v 1.203 2014/04/01 15:57:28 christos Exp $&quot;)
+ #endif        /* lint */

+ #include &quot;magic.h&quot;
+@@ -517,14 +517,18 @@
+ {
+         if (map == NULL)
+                 return;
+-        if (map-&gt;p == NULL)
+-                return;
++        if (map-&gt;p != NULL) {
+ #ifdef QUICK
+-        if (map-&gt;len)
+-                (void)munmap(map-&gt;p, map-&gt;len);
+-        else
++                if (map-&gt;len)
++                        (void)munmap(map-&gt;p, map-&gt;len);
++                else
+ #endif
+                 free(map-&gt;p);
++        } else {
++                uint32_t j;
++                for (j = 0; j &lt; MAGIC_SETS; j++)
++                        free(map-&gt;magic[j]);
++        }
+         free(map);
+ }

+@@ -1290,11 +1294,7 @@
+                 magic_entry_free(mset[j].me, mset[j].count);

+         if (errs) {
+-                for (j = 0; j &lt; MAGIC_SETS; j++) {
+-                        if (map-&gt;magic[j])
+-                                free(map-&gt;magic[j]);
+-                }
+-                free(map);
++                apprentice_unmap(map);
+                 return NULL;
+         }
+         return map;
+Index: src/softmagic.c
+===================================================================
+RCS file: /p/file/cvsroot/file/src/softmagic.c,v
+retrieving revision 1.180
+retrieving revision 1.183
+diff -u -r1.180 -r1.183
+--- src/softmagic.c        15 Mar 2014 21:47:40 -0000        1.180
++++ src/softmagic.c        1 Apr 2014 15:44:26 -0000        1.183
+@@ -32,11 +32,10 @@
+ #include &quot;file.h&quot;

+ #ifndef        lint
+-FILE_RCSID(&quot;@(#)$File: softmagic.c,v 1.180 2014/03/15 21:47:40 christos Exp $&quot;)
++FILE_RCSID(&quot;@(#)$File: softmagic.c,v 1.183 2014/04/01 15:44:26 christos Exp $&quot;)
+ #endif        /* lint */

+ #include &quot;magic.h&quot;
+-#define F(a, b) fmtcheck((a), (b))
+ #include &lt;assert.h&gt;
+ #include &lt;string.h&gt;
+ #include &lt;ctype.h&gt;
+@@ -88,6 +87,25 @@
+         return 0;
+ }

++#define FILE_FMTDEBUG
++#ifdef FILE_FMTDEBUG
++#define F(a, b, c) file_fmtcheck((a), (b), (c), __FILE__, __LINE__)
++
++private const char * __attribute__((__format_arg__(3)))
++file_fmtcheck(struct magic_set *ms, const struct magic *m, const char *def,
++        const char *file, size_t line)
++{
++        const char *ptr = fmtcheck(m-&gt;desc, def);
++        if (ptr == def)
++                file_magerror(ms,
++                    &quot;%s, %zu: format `%s' does not match with `%s'&quot;,
++                    file, line, m-&gt;desc, def);
++        return ptr;
++}
++#else
++#define F(a, b, c) fmtcheck((b)-&gt;desc, (c))
++#endif
++
+ /*
+  * Go through the whole list, stopping if you find a match.  Process all
+  * the continuations of that match before returning.
+@@ -217,8 +235,8 @@
+                 if (file_check_mem(ms, ++cont_level) == -1)
+                         return -1;

+-                while (magic[magindex+1].cont_level != 0 &amp;&amp;
+-                    ++magindex &lt; nmagic) {
++                while (++magindex &lt; nmagic &amp;&amp;
++                    magic[magindex].cont_level != 0) {
+                         m = &amp;magic[magindex];
+                         ms-&gt;line = m-&gt;lineno; /* for messages */

+@@ -411,11 +429,11 @@
+                 case 1:
+                         (void)snprintf(buf, sizeof(buf), &quot;%c&quot;,
+                             (unsigned char)v);
+-                        if (file_printf(ms, F(m-&gt;desc, &quot;%s&quot;), buf) == -1)
++                        if (file_printf(ms, F(ms, m, &quot;%s&quot;), buf) == -1)
+                                 return -1;
+                         break;
+                 default:
+-                        if (file_printf(ms, F(m-&gt;desc, &quot;%c&quot;),
++                        if (file_printf(ms, F(ms, m, &quot;%c&quot;),
+                             (unsigned char) v) == -1)
+                                 return -1;
+                         break;
+@@ -433,11 +451,11 @@
+                 case 1:
+                         (void)snprintf(buf, sizeof(buf), &quot;%hu&quot;,
+                             (unsigned short)v);
+-                        if (file_printf(ms, F(m-&gt;desc, &quot;%s&quot;), buf) == -1)
++                        if (file_printf(ms, F(ms, m, &quot;%s&quot;), buf) == -1)
+                                 return -1;
+                         break;
+                 default:
+-                        if (file_printf(ms, F(m-&gt;desc, &quot;%hu&quot;),
++                        if (file_printf(ms, F(ms, m, &quot;%hu&quot;),
+                             (unsigned short) v) == -1)
+                                 return -1;
+                         break;
+@@ -454,13 +472,14 @@
+                 case -1:
+                         return -1;
+                 case 1:
+-                        (void)snprintf(buf, sizeof(buf), &quot;%u&quot;, (uint32_t)v);
+-                        if (file_printf(ms, F(m-&gt;desc, &quot;%s&quot;), buf) == -1)
++                        (void)snprintf(buf, sizeof(buf), &quot;%lu&quot;,
++                            (unsigned long)(uint32_t) v);
++                        if (file_printf(ms, F(ms, m, &quot;%s&quot;), buf) == -1)
+                                 return -1;
+                         break;
+                 default:
+-                        if (file_printf(ms, F(m-&gt;desc, &quot;%u&quot;),
+-                            (uint32_t) v) == -1)
++                        if (file_printf(ms, F(ms, m, &quot;%lu&quot;),
++                            (unsigned long)(uint32_t) v) == -1)
+                                 return -1;
+                         break;
+                 }
+@@ -477,11 +496,11 @@
+                 case 1:
+                         (void)snprintf(buf, sizeof(buf), &quot;%llu&quot;,
+                             (unsigned long long)v);
+-                        if (file_printf(ms, F(m-&gt;desc, &quot;%s&quot;), buf) == -1)
++                        if (file_printf(ms, F(ms, m, &quot;%s&quot;), buf) == -1)
+                                 return -1;
+                         break;
+                 default:
+-                        if (file_printf(ms, F(m-&gt;desc, &quot;%llu&quot;),
++                        if (file_printf(ms, F(ms, m, &quot;%llu&quot;),
+                             (unsigned long long) v) == -1)
+                                 return -1;
+                         break;
+@@ -494,7 +513,7 @@
+           case FILE_BESTRING16:
+           case FILE_LESTRING16:
+                 if (m-&gt;reln == '=' || m-&gt;reln == '!') {
+-                        if (file_printf(ms, F(m-&gt;desc, &quot;%s&quot;), m-&gt;value.s) == -1)
++                        if (file_printf(ms, F(ms, m, &quot;%s&quot;), m-&gt;value.s) == -1)
+                                 return -1;
+                         t = ms-&gt;offset + m-&gt;vallen;
+                 }
+@@ -520,7 +539,7 @@
+                                 *++last = '\0';
+                         }

+-                        if (file_printf(ms, F(m-&gt;desc, &quot;%s&quot;), str) == -1)
++                        if (file_printf(ms, F(ms, m, &quot;%s&quot;), str) == -1)
+                                 return -1;

+                         if (m-&gt;type == FILE_PSTRING)
+@@ -532,7 +551,7 @@
+         case FILE_BEDATE:
+         case FILE_LEDATE:
+         case FILE_MEDATE:
+-                if (file_printf(ms, F(m-&gt;desc, &quot;%s&quot;),
++                if (file_printf(ms, F(ms, m, &quot;%s&quot;),
+                     file_fmttime(p-&gt;l, FILE_T_LOCAL, tbuf)) == -1)
+                         return -1;
+                 t = ms-&gt;offset + sizeof(uint32_t);
+@@ -542,7 +561,7 @@
+         case FILE_BELDATE:
+         case FILE_LELDATE:
+         case FILE_MELDATE:
+-                if (file_printf(ms, F(m-&gt;desc, &quot;%s&quot;),
++                if (file_printf(ms, F(ms, m, &quot;%s&quot;),
+                     file_fmttime(p-&gt;l, 0, tbuf)) == -1)
+                         return -1;
+                 t = ms-&gt;offset + sizeof(uint32_t);
+@@ -551,7 +570,7 @@
+         case FILE_QDATE:
+         case FILE_BEQDATE:
+         case FILE_LEQDATE:
+-                if (file_printf(ms, F(m-&gt;desc, &quot;%s&quot;),
++                if (file_printf(ms, F(ms, m, &quot;%s&quot;),
+                     file_fmttime(p-&gt;q, FILE_T_LOCAL, tbuf)) == -1)
+                         return -1;
+                 t = ms-&gt;offset + sizeof(uint64_t);
+@@ -560,7 +579,7 @@
+         case FILE_QLDATE:
+         case FILE_BEQLDATE:
+         case FILE_LEQLDATE:
+-                if (file_printf(ms, F(m-&gt;desc, &quot;%s&quot;),
++                if (file_printf(ms, F(ms, m, &quot;%s&quot;),
+                     file_fmttime(p-&gt;q, 0, tbuf)) == -1)
+                         return -1;
+                 t = ms-&gt;offset + sizeof(uint64_t);
+@@ -569,7 +588,7 @@
+         case FILE_QWDATE:
+         case FILE_BEQWDATE:
+         case FILE_LEQWDATE:
+-                if (file_printf(ms, F(m-&gt;desc, &quot;%s&quot;),
++                if (file_printf(ms, F(ms, m, &quot;%s&quot;),
+                     file_fmttime(p-&gt;q, FILE_T_WINDOWS, tbuf)) == -1)
+                         return -1;
+                 t = ms-&gt;offset + sizeof(uint64_t);
+@@ -584,11 +603,11 @@
+                         return -1;
+                 case 1:
+                         (void)snprintf(buf, sizeof(buf), &quot;%g&quot;, vf);
+-                        if (file_printf(ms, F(m-&gt;desc, &quot;%s&quot;), buf) == -1)
++                        if (file_printf(ms, F(ms, m, &quot;%s&quot;), buf) == -1)
+                                 return -1;
+                         break;
+                 default:
+-                        if (file_printf(ms, F(m-&gt;desc, &quot;%g&quot;), vf) == -1)
++                        if (file_printf(ms, F(ms, m, &quot;%g&quot;), vf) == -1)
+                                 return -1;
+                         break;
+                 }
+@@ -604,11 +623,11 @@
+                         return -1;
+                 case 1:
+                         (void)snprintf(buf, sizeof(buf), &quot;%g&quot;, vd);
+-                        if (file_printf(ms, F(m-&gt;desc, &quot;%s&quot;), buf) == -1)
++                        if (file_printf(ms, F(ms, m, &quot;%s&quot;), buf) == -1)
+                                 return -1;
+                         break;
+                 default:
+-                        if (file_printf(ms, F(m-&gt;desc, &quot;%g&quot;), vd) == -1)
++                        if (file_printf(ms, F(ms, m, &quot;%g&quot;), vd) == -1)
+                                 return -1;
+                         break;
+                 }
+@@ -624,7 +643,7 @@
+                         file_oomem(ms, ms-&gt;search.rm_len);
+                         return -1;
+                 }
+-                rval = file_printf(ms, F(m-&gt;desc, &quot;%s&quot;), cp);
++                rval = file_printf(ms, F(ms, m, &quot;%s&quot;), cp);
+                 free(cp);

+                 if (rval == -1)
+@@ -638,7 +657,7 @@
+         }

+         case FILE_SEARCH:
+-                  if (file_printf(ms, F(m-&gt;desc, &quot;%s&quot;), m-&gt;value.s) == -1)
++                  if (file_printf(ms, F(ms, m, &quot;%s&quot;), m-&gt;value.s) == -1)
+                         return -1;
+                 if ((m-&gt;str_flags &amp; REGEX_OFFSET_START))
+                         t = ms-&gt;search.offset;
+@@ -1756,7 +1775,7 @@
+                 ms-&gt;offset = soffset;
+                 if (rv == 1) {
+                         if ((ms-&gt;flags &amp; (MAGIC_MIME|MAGIC_APPLE)) == 0 &amp;&amp;
+-                            file_printf(ms, F(m-&gt;desc, &quot;%u&quot;), offset) == -1) {
++                            file_printf(ms, F(ms, m, &quot;%u&quot;), offset) == -1) {
+                                 free(rbuf);
+                                 return -1;
+                         }
</ins></span></pre>
</div>
</div>

</body>
</html>