diff options
author | Junio C Hamano <gitster@pobox.com> | 2007-11-04 01:17:50 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2007-11-04 01:17:50 -0700 |
commit | c8a140fee4e7df83b7eb781e436b88b067f149d1 (patch) | |
tree | c24f3a016a9fddd30ebf012a6b3d07fc5535fc00 /builtin-mailinfo.c | |
parent | e091653951ae516a923338874bfe550894cd1bc9 (diff) | |
parent | f88a545a94cb474d370ef97dd3694d09b6ac90c1 (diff) | |
download | git-c8a140fee4e7df83b7eb781e436b88b067f149d1.tar.gz |
Merge branch 'ss/mailsplit'
* ss/mailsplit:
Make mailsplit and mailinfo strip whitespace from the start of the input
Diffstat (limited to 'builtin-mailinfo.c')
-rw-r--r-- | builtin-mailinfo.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c index fb12248f82..2600847974 100644 --- a/builtin-mailinfo.c +++ b/builtin-mailinfo.c @@ -915,6 +915,7 @@ static void handle_info(void) static int mailinfo(FILE *in, FILE *out, int ks, const char *encoding, const char *msg, const char *patch) { + int peek; keep_subject = ks; metainfo_charset = encoding; fin = in; @@ -935,6 +936,11 @@ static int mailinfo(FILE *in, FILE *out, int ks, const char *encoding, p_hdr_data = xcalloc(MAX_HDR_PARSED, sizeof(char *)); s_hdr_data = xcalloc(MAX_HDR_PARSED, sizeof(char *)); + do { + peek = fgetc(in); + } while (isspace(peek)); + ungetc(peek, in); + /* process the email header */ while (read_one_header_line(line, sizeof(line), fin)) check_header(line, sizeof(line), p_hdr_data, 1); |