aboutsummaryrefslogtreecommitdiff
path: root/builtin-mailsplit.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-11-04 01:17:50 -0700
committerJunio C Hamano <gitster@pobox.com>2007-11-04 01:17:50 -0700
commitc8a140fee4e7df83b7eb781e436b88b067f149d1 (patch)
treec24f3a016a9fddd30ebf012a6b3d07fc5535fc00 /builtin-mailsplit.c
parente091653951ae516a923338874bfe550894cd1bc9 (diff)
parentf88a545a94cb474d370ef97dd3694d09b6ac90c1 (diff)
downloadgit-c8a140fee4e7df83b7eb781e436b88b067f149d1.tar.xz
Merge branch 'ss/mailsplit'
* ss/mailsplit: Make mailsplit and mailinfo strip whitespace from the start of the input
Diffstat (limited to 'builtin-mailsplit.c')
-rw-r--r--builtin-mailsplit.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/builtin-mailsplit.c b/builtin-mailsplit.c
index 43fc373a15..74b04706f3 100644
--- a/builtin-mailsplit.c
+++ b/builtin-mailsplit.c
@@ -164,6 +164,7 @@ static int split_mbox(const char *file, const char *dir, int allow_bare,
{
char name[PATH_MAX];
int ret = -1;
+ int peek;
FILE *f = !strcmp(file, "-") ? stdin : fopen(file, "r");
int file_done = 0;
@@ -173,6 +174,11 @@ static int split_mbox(const char *file, const char *dir, int allow_bare,
goto out;
}
+ do {
+ peek = fgetc(f);
+ } while (isspace(peek));
+ ungetc(peek, f);
+
if (fgets(buf, sizeof(buf), f) == NULL) {
/* empty stdin is OK */
if (f != stdin) {