tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

change rfc2047 mail header decoding (=?iso-xx stuff) so that a start of encoding section can be recognized even not after white space

Browse Source
This commit is contained in:
dockes 2009-10-31 08:59:54 +00:00
parent d26164931b
commit 5db229d492
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/utils/mimeparse.cpp
View File

@ -474,7 +474,7 @@ static bool rfc2047_decodeParsed(const std::string& charset,
// Bugs: // Bugs:
// - We should turn off decoding while inside quoted strings // - We should turn off decoding while inside quoted strings
// //
typedef enum {rfc2047base, rfc2047ready, rfc2047open_eq, typedef enum {rfc2047ready, rfc2047open_eq,
rfc2047charset, rfc2047encoding, rfc2047charset, rfc2047encoding,
rfc2047value, rfc2047close_q} Rfc2047States; rfc2047value, rfc2047close_q} Rfc2047States;
@ -490,30 +490,23 @@ bool rfc2047_decode(const std::string& in, std::string &out)
for (string::size_type ii = 0; ii < in.length(); ii++) { for (string::size_type ii = 0; ii < in.length(); ii++) {
char ch = in[ii]; char ch = in[ii];
switch (state) { switch (state) {
case rfc2047base:
{
value += ch;
switch (ch) {
// Linear whitespace
case ' ': case ' ': state = rfc2047ready; break;
default: break;
}
}
break;
case rfc2047ready: case rfc2047ready:
{ {
DPRINT((stderr, "STATE: ready, ch %c\n", ch));
switch (ch) { switch (ch) {
// Whitespace: stay ready // Whitespace: stay ready
case ' ': case ' ': value += ch;break; case ' ': case ' ': value += ch;break;
// '=' -> forward to next state // '=' -> forward to next state
case '=': state = rfc2047open_eq; break; case '=': state = rfc2047open_eq; break;
DPRINT((stderr, "STATE: open_eq\n"));
// Other: go back to sleep // Other: go back to sleep
default: value += ch; state = rfc2047base; default: value += ch; state = rfc2047ready;
} }
} }
break; break;
case rfc2047open_eq: case rfc2047open_eq:
{ {
DPRINT((stderr, "STATE: open_eq, ch %c\n", ch));
switch (ch) { switch (ch) {
case '?': case '?':
{ {
@ -528,12 +521,13 @@ bool rfc2047_decode(const std::string& in, std::string &out)
state = rfc2047charset; state = rfc2047charset;
} }
break; break;
default: state = rfc2047base; out += '='; out += ch;break; default: state = rfc2047ready; out += '='; out += ch;break;
} }
} }
break; break;
case rfc2047charset: case rfc2047charset:
{ {
DPRINT((stderr, "STATE: charset, ch %c\n", ch));
switch (ch) { switch (ch) {
case '?': state = rfc2047encoding; break; case '?': state = rfc2047encoding; break;
default: charset += ch; break; default: charset += ch; break;
@ -542,6 +536,7 @@ bool rfc2047_decode(const std::string& in, std::string &out)
break; break;
case rfc2047encoding: case rfc2047encoding:
{ {
DPRINT((stderr, "STATE: encoding, ch %c\n", ch));
switch (ch) { switch (ch) {
case '?': state = rfc2047value; break; case '?': state = rfc2047value; break;
default: encoding += ch; break; default: encoding += ch; break;
@ -550,6 +545,7 @@ bool rfc2047_decode(const std::string& in, std::string &out)
break; break;
case rfc2047value: case rfc2047value:
{ {
DPRINT((stderr, "STATE: value, ch %c\n", ch));
switch (ch) { switch (ch) {
case '?': state = rfc2047close_q; break; case '?': state = rfc2047close_q; break;
default: value += ch;break; default: value += ch;break;
@ -558,11 +554,13 @@ bool rfc2047_decode(const std::string& in, std::string &out)
break; break;
case rfc2047close_q: case rfc2047close_q:
{ {
DPRINT((stderr, "STATE: close_q, ch %c\n", ch));
switch (ch) { switch (ch) {
case '=': case '=':
{ {
DPRINT((stderr, "End of encoded area. Charset %s, Encoding %s\n", charset.c_str(), encoding.c_str()));
string utf8; string utf8;
state = rfc2047base; state = rfc2047ready;
if (!rfc2047_decodeParsed(charset, encoding, value, if (!rfc2047_decodeParsed(charset, encoding, value,
utf8)) { utf8)) {
return false; return false;
@ -578,6 +576,7 @@ bool rfc2047_decode(const std::string& in, std::string &out)
} }
break; break;
default: // ?? default: // ??
DPRINT((stderr, "STATE: default ?? ch %c\n", ch));
return false; return false;
} }
} }
@ -587,7 +586,7 @@ bool rfc2047_decode(const std::string& in, std::string &out)
out += utf8; out += utf8;
value.clear(); value.clear();
} }
if (state != rfc2047base) if (state != rfc2047ready)
return false; return false;
return true; return true;
} }