X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-mime%2Fmime-token.sh;h=229394c24544129a1472adafa891ac1b6a148b23;hp=bb55179374644b4ad6d05985cf2add8e21299bb7;hb=9ed7a487e3a922f2cbb222961c2c9710c3a65f91;hpb=3a3420a4cb3369d51eecc9287d556596f98e7314

diff --git a/lib-mime/mime-token.sh b/lib-mime/mime-token.sh
index bb55179..229394c 100644
--- a/lib-mime/mime-token.sh
+++ b/lib-mime/mime-token.sh
@@ -39,7 +39,7 @@ do_h() {
 
 enum mime_token {
     MUTT_MIME_TOKEN_UNKNOWN,
-`tr 'a-z-' 'A-Z_' | sed -e 's/.*/    MIME_&,/'`
+`tr 'a-z-/' 'A-Z__' | sed -e 's/.*/    MIME_&,/'`
 };
 
 __attribute__((pure))
@@ -49,29 +49,33 @@ EOF
 }
 
 do_c() {
-    cat <<EOF | gperf --ignore-case -l -t -C -F,0
+    cat <<EOF | gperf --ignore-case -m16 -l -t -C -F",0" -Nmime_which_token_aux
 %{
 `do_hdr`
 
-#include <lib-lib/str.h>
+#include <lib-lib/lib-lib.h>
 #include "mime-token.h"
 
+static const struct tok *
+mime_which_token_aux(const char *str, unsigned int len);
+
 %}
 struct tok { const char *name; int val; };
 %%
 `awk '{print $0 ", " NR }'`
 %%
 
-enum mime_token mime_which_token(const char *s, ssize_t len) {
-    const struct tok *res;
-
+enum mime_token mime_which_token(const char *s, ssize_t len)
+{
     if (len < 0)
         len = m_strlen(s);
-    if (!len)
-        return MUTT_MIME_TOKEN_UNKNOWN;
 
-    res = in_word_set(s, len);
-    return res ? res->val : MUTT_MIME_TOKEN_UNKNOWN;
+    if (len) {
+        const struct tok *res = mime_which_token_aux(s, len);
+        return res ? res->val : MUTT_MIME_TOKEN_UNKNOWN;
+    } else {
+        return MUTT_MIME_TOKEN_UNKNOWN;
+    }
 }
 EOF
 }