undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move B and Q decoding into check header.

Browse Source 
B and Q decoding is not appropriate for in body headers, so move
it up to where we explicitly know we have a real email header.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Eric W. Biederman 2006-05-23 13:45:37 -06:00 committed by Junio C Hamano
parent f8128cfb8d
commit 3350453014
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mailinfo.c
View File

@ -324,6 +324,7 @@ static void cleanup_space(char *buf)
} }
} }
static void decode_header_bq(char *it);
typedef int (*header_fn_t)(char *); typedef int (*header_fn_t)(char *);
struct header_def { struct header_def {
const char *name; const char *name;
@ -343,6 +344,10 @@ static void check_header(char *line, struct header_def *header)
int len = header[i].namelen; int len = header[i].namelen;
if (!strncasecmp(line, header[i].name, len) && if (!strncasecmp(line, header[i].name, len) &&
line[len] == ':' && isspace(line[len + 1])) { line[len] == ':' && isspace(line[len + 1])) {
/* Unwrap inline B and Q encoding, and optionally
* normalize the meta information to utf8.
*/
decode_header_bq(line + len + 2);
header[i].func(line + len + 2); header[i].func(line + len + 2);
break; break;
} }
@ -597,13 +602,6 @@ static void handle_info(void)
cleanup_space(email); cleanup_space(email);
cleanup_space(sub); cleanup_space(sub);
/* Unwrap inline B and Q encoding, and optionally
* normalize the meta information to utf8.
*/
decode_header_bq(name);
decode_header_bq(date);
decode_header_bq(email);
decode_header_bq(sub);
printf("Author: %s\nEmail: %s\nSubject: %s\nDate: %s\n\n", printf("Author: %s\nEmail: %s\nSubject: %s\nDate: %s\n\n",
name, email, sub, date); name, email, sub, date);
} }