On Nov 7, 4:55am, [EMAIL PROTECTED] (Matt Taggart) wrote: -- Subject: Debian bug #500734
| Hi Christos, | | I just realized when I sent mail to Debian bug #500734 I forgot to cc you. | Can you take a look? | | http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=500734 Can you try this patch? Thanks, christos Index: apprentice.c =================================================================== RCS file: /p/file/cvsroot/file/src/apprentice.c,v retrieving revision 1.145 diff -u -u -r1.145 apprentice.c --- apprentice.c 6 Nov 2008 23:22:54 -0000 1.145 +++ apprentice.c 7 Nov 2008 15:50:21 -0000 @@ -107,7 +107,7 @@ private uint16_t swap2(uint16_t); private uint32_t swap4(uint32_t); private uint64_t swap8(uint64_t); -private void mkdbname(const char *, char **, int); +private char *mkdbname(struct magic_set *, const char *, int); private int apprentice_map(struct magic_set *, struct magic **, uint32_t *, const char *); private int apprentice_compile(struct magic_set *, struct magic **, uint32_t *, @@ -2059,7 +2059,7 @@ char *dbname = NULL; void *mm = NULL; - mkdbname(fn, &dbname, 0); + dbname = mkdbname(ms, fn, 0); if (dbname == NULL) goto error2; @@ -2156,7 +2156,7 @@ char *dbname; int rv = -1; - mkdbname(fn, &dbname, 1); + dbname = mkdbname(ms, fn, 1); if (dbname == NULL) goto out; @@ -2194,24 +2194,45 @@ /* * make a dbname */ -private void -mkdbname(const char *fn, char **buf, int strip) +private char * +mkdbname(struct magic_set *ms, const char *fn, int strip) { - const char *p; + const char *p, *q; + char *buf; + if (strip) { if ((p = strrchr(fn, '/')) != NULL) fn = ++p; } - if ((p = strstr(fn, ext)) != NULL && p[sizeof(ext) - 1] == '\0') - *buf = strdup(fn); - else - (void)asprintf(buf, "%s%s", fn, ext); + for (q = fn; *q; q++) + continue; + /* Look for .mgc */ + for (p = ext + sizeof(ext) - 1; p >= ext && q >= fn; p--, q--) + if (*p != *q) + break; - if (buf && *buf && strlen(*buf) > MAXPATHLEN) { - free(*buf); - *buf = NULL; - } + /* Did not find .mgc, restore q */ + if (p >= ext) + while (*q) + q++; + + q++; + /* Compatibility with old code that looked in .mime */ + if (ms->flags & MAGIC_MIME) { + asprintf(&buf, "%.*s.mime%s", (int)(q - fn), fn, ext); + if (access(buf, R_OK) != -1) { + ms->flags &= MAGIC_MIME_TYPE; + return buf; + } + free(buf); + } + asprintf(&buf, "%.*s%s", (int)(q - fn), fn, ext); + + /* Compatibility with old code that looked in .mime */ + if (strstr(p, ".mime") != NULL) + ms->flags &= MAGIC_MIME_TYPE; + return buf; } /* -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
