projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move more things in the lib-ui.
[apps/madmutt.git]
/
lib-mime
/
mime-token.sh
diff --git
a/lib-mime/mime-token.sh
b/lib-mime/mime-token.sh
index
bb55179
..
84c3664
100644
(file)
--- 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,
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))
};
__attribute__((pure))
@@
-49,7
+49,7
@@
EOF
}
do_c() {
}
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`
%{
`do_hdr`
@@
-62,16
+62,17
@@
struct tok { const char *name; int val; };
`awk '{print $0 ", " NR }'`
%%
`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 < 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
}
}
EOF
}