Make mailsplit and mailinfo strip whitespace from the start of the input
Signed-off-by: Simon Sasburg <Simon.Sasburg@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Simon Sasburg committed
Nov 1, 2007 at 23:57 UTC
f88a545a94cb474d370ef97dd3694d09b6ac90c1
3 files changed
+15
builtin-mailinfo.c
+6
@@ -915,6 +915,7 @@ static void handle_info(void)
915
static int mailinfo(FILE *in, FILE *out, int ks, const char *encoding,
916
const char *msg, const char *patch)
917
{
918
+ int peek;
919
keep_subject = ks;
920
metainfo_charset = encoding;
921
fin = in;
@@ -935,6 +936,11 @@ static int mailinfo(FILE *in, FILE *out, int ks, const char *encoding,
936
p_hdr_data = xcalloc(MAX_HDR_PARSED, sizeof(char *));
937
s_hdr_data = xcalloc(MAX_HDR_PARSED, sizeof(char *));
938
939
+ do {
940
+ peek = fgetc(in);
941
+ } while (isspace(peek));
942
+ ungetc(peek, in);
943
+
944
/* process the email header */
945
while (read_one_header_line(line, sizeof(line), fin))
946
check_header(line, sizeof(line), p_hdr_data, 1);
builtin-mailsplit.c
+6
@@ -164,6 +164,7 @@ static int split_mbox(const char *file, const char *dir, int allow_bare,
164
{
165
char name[PATH_MAX];
166
int ret = -1;
167
+ int peek;
168
169
FILE *f = !strcmp(file, "-") ? stdin : fopen(file, "r");
170
int file_done = 0;
@@ -173,6 +174,11 @@ static int split_mbox(const char *file, const char *dir, int allow_bare,
174
goto out;
175
}
176
177
+ do {
178
+ peek = fgetc(f);
179
+ } while (isspace(peek));
180
+ ungetc(peek, f);
181
+
182
if (fgets(buf, sizeof(buf), f) == NULL) {
183
/* empty stdin is OK */
184
if (f != stdin) {
t/t5100/sample.mbox
+3
@@ -1,3 +1,6 @@
1
+
2
+
3
+
4
From nobody Mon Sep 17 00:00:00 2001
5
From: A U Thor <a.u.thor@example.com>
6
Date: Fri, 9 Jun 2006 00:44:16 -0700