X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin%2Fmailinfo.c;h=2320d981ceab220e287e42c21f3c9f3be5b3722f;hb=385cc9d8c44eb5be9d57e630129752a72c0a08c8;hp=ce2ef6bede40fde8823336bc85762bd3e7cd4760;hpb=d718dd0732c125306670d61880652f1b596a0c3e;p=git.git diff --git a/builtin/mailinfo.c b/builtin/mailinfo.c index ce2ef6bed..2320d981c 100644 --- a/builtin/mailinfo.c +++ b/builtin/mailinfo.c @@ -17,10 +17,10 @@ static struct strbuf name = STRBUF_INIT; static struct strbuf email = STRBUF_INIT; static enum { - TE_DONTCARE, TE_QP, TE_BASE64, + TE_DONTCARE, TE_QP, TE_BASE64 } transfer_encoding; static enum { - TYPE_TEXT, TYPE_OTHER, + TYPE_TEXT, TYPE_OTHER } message_type; static struct strbuf charset = STRBUF_INIT; @@ -746,7 +746,8 @@ static int is_scissors_line(const struct strbuf *line) continue; } if (i + 1 < len && - (!memcmp(buf + i, ">8", 2) || !memcmp(buf + i, "8<", 2))) { + (!memcmp(buf + i, ">8", 2) || !memcmp(buf + i, "8<", 2) || + !memcmp(buf + i, ">%", 2) || !memcmp(buf + i, "%<", 2))) { in_perforation = 1; perforation += 2; scissors += 2;