more after patch fixes

diff --git a/ext/fileinfo/libmagic/apprentice.c b/ext/fileinfo/libmagic/apprentice.c
index 22899b31f7cb3cf9bb861afbc932c9ffdf6916f4..5e843faba96860b028d42bbeb93b5611ffc2adcb 100644 (file)
--- a/ext/fileinfo/libmagic/apprentice.c
+++ b/ext/fileinfo/libmagic/apprentice.c
@@ -447,7 +447,8 @@ apprentice_1(struct magic_set *ms, const char *fn, int action)
 
        if (action == FILE_LIST) {
                for (i = 0; i < MAGIC_SETS; i++) {
-                       printf("Set " SIZE_T_FORMAT ":\nBinary patterns:\n",i);
+                       printf("Set %" SIZE_T_FORMAT "u:\nBinary patterns:\n",
+                           i);
                        apprentice_list(ms->mlist[i], BINTEST);
                        printf("Text patterns:\n");
                        apprentice_list(ms->mlist[i], TEXTTEST);

diff --git a/ext/fileinfo/libmagic/readcdf.c b/ext/fileinfo/libmagic/readcdf.c
index 5c4be2cc69297f7a404192f6c46d018b3f1214ad..0fb028380e4ebdc398a417b39e9a932d5f7b8c59 100644 (file)
--- a/ext/fileinfo/libmagic/readcdf.c
+++ b/ext/fileinfo/libmagic/readcdf.c
@@ -107,7 +107,7 @@ static const struct cv {
        },
        {       { 0,                     0                      },
                NULL,
-       }
+       },
 };
 
 private const char *

diff --git a/ext/fileinfo/libmagic/softmagic.c b/ext/fileinfo/libmagic/softmagic.c
index 9aaea49b326d10ac484c19a7719cf19bc930c4df..d11eba38166d8b52a022d3ba96999944028a43a6 100644 (file)
--- a/ext/fileinfo/libmagic/softmagic.c
+++ b/ext/fileinfo/libmagic/softmagic.c
@@ -636,7 +636,7 @@ mprint(struct magic_set *ms, struct magic *m)
                }
                rval = file_printf(ms, F(ms, m, "%s"),
                    file_printable(sbuf, sizeof(sbuf), cp));
-               free(cp);
+               efree(cp);
 
                if (rval == -1)
                        return -1;
@@ -1089,13 +1089,8 @@ mcopy(struct magic_set *ms, union VALUETYPE *p, int type, int indir,
                                return 0;
                        }
 
-                       if (m->str_flags & REGEX_LINE_COUNT) {
-                               linecnt = m->str_range;
-                               bytecnt = linecnt * 80;
-                       } else {
-                               linecnt = 0;
-                               bytecnt = m->str_range;
-                       }
+                       linecnt = m->str_range;
+                       bytecnt = linecnt * 80;
 
                        if (bytecnt == 0 || bytecnt > nbytes - offset)
                                bytecnt = nbytes - offset;
@@ -1667,11 +1662,11 @@ mget(struct magic_set *ms, const unsigned char *s, struct magic *m,
                                return -1;
                        }
                        if (file_printf(ms, "%s", rbuf) == -1) {
-                               if (rbuf) free(rbuf);
+                               if (rbuf) efree(rbuf);
                                return -1;
                        }
                }
-               if (rbuf) free(rbuf);
+               if (rbuf) efree(rbuf);
                return rv;
 
        case FILE_USE: