Skip to content

Commit

Permalink
Move B and Q decoding into check header.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Eric W. Biederman authored and Junio C Hamano committed May 23, 2006
1 parent f8128cf commit 3350453
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions mailinfo.c
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,7 @@ static void cleanup_space(char *buf)
}
}

static void decode_header_bq(char *it);
typedef int (*header_fn_t)(char *);
struct header_def {
const char *name;
Expand All @@ -343,6 +344,10 @@ static void check_header(char *line, struct header_def *header)
int len = header[i].namelen;
if (!strncasecmp(line, header[i].name, len) &&
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);
break;
}
Expand Down Expand Up @@ -597,13 +602,6 @@ static void handle_info(void)
cleanup_space(email);
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",
name, email, sub, date);
}
Expand Down

0 comments on commit 3350453

Please sign in to comment.