7 static void cleanup_space(struct strbuf
*sb
)
10 for (pos
= 0; pos
< sb
->len
; pos
++) {
11 if (isspace(sb
->buf
[pos
])) {
13 for (cnt
= 0; isspace(sb
->buf
[pos
+ cnt
+ 1]); cnt
++);
14 strbuf_remove(sb
, pos
+ 1, cnt
);
19 static void get_sane_name(struct strbuf
*out
, struct strbuf
*name
, struct strbuf
*email
)
21 struct strbuf
*src
= name
;
22 if (name
->len
< 3 || 60 < name
->len
|| strpbrk(name
->buf
, "@<>"))
27 strbuf_addbuf(out
, src
);
30 static void parse_bogus_from(struct mailinfo
*mi
, const struct strbuf
*line
)
32 /* John Doe <johndoe> */
35 /* This is fallback, so do not bother if we already have an
41 bra
= strchr(line
->buf
, '<');
44 ket
= strchr(bra
, '>');
48 strbuf_reset(&mi
->email
);
49 strbuf_add(&mi
->email
, bra
+ 1, ket
- bra
- 1);
51 strbuf_reset(&mi
->name
);
52 strbuf_add(&mi
->name
, line
->buf
, bra
- line
->buf
);
53 strbuf_trim(&mi
->name
);
54 get_sane_name(&mi
->name
, &mi
->name
, &mi
->email
);
57 static const char *unquote_comment(struct strbuf
*outbuf
, const char *in
)
60 int take_next_literally
= 0;
62 strbuf_addch(outbuf
, '(');
64 while ((c
= *in
++) != 0) {
65 if (take_next_literally
== 1) {
66 take_next_literally
= 0;
70 take_next_literally
= 1;
73 in
= unquote_comment(outbuf
, in
);
76 strbuf_addch(outbuf
, ')');
81 strbuf_addch(outbuf
, c
);
87 static const char *unquote_quoted_string(struct strbuf
*outbuf
, const char *in
)
90 int take_next_literally
= 0;
92 while ((c
= *in
++) != 0) {
93 if (take_next_literally
== 1) {
94 take_next_literally
= 0;
98 take_next_literally
= 1;
105 strbuf_addch(outbuf
, c
);
111 static void unquote_quoted_pair(struct strbuf
*line
)
113 struct strbuf outbuf
;
114 const char *in
= line
->buf
;
117 strbuf_init(&outbuf
, line
->len
);
119 while ((c
= *in
++) != 0) {
122 in
= unquote_quoted_string(&outbuf
, in
);
125 in
= unquote_comment(&outbuf
, in
);
129 strbuf_addch(&outbuf
, c
);
132 strbuf_swap(&outbuf
, line
);
133 strbuf_release(&outbuf
);
137 static void handle_from(struct mailinfo
*mi
, const struct strbuf
*from
)
143 strbuf_init(&f
, from
->len
);
144 strbuf_addbuf(&f
, from
);
146 unquote_quoted_pair(&f
);
148 at
= strchr(f
.buf
, '@');
150 parse_bogus_from(mi
, from
);
155 * If we already have one email, don't take any confusing lines
157 if (mi
->email
.len
&& strchr(at
+ 1, '@'))
160 /* Pick up the string around '@', possibly delimited with <>
161 * pair; that is the email part.
173 el
= strcspn(at
, " \n\t\r\v\f>");
174 strbuf_reset(&mi
->email
);
175 strbuf_add(&mi
->email
, at
, el
);
176 strbuf_remove(&f
, at
- f
.buf
, el
+ (at
[el
] ? 1 : 0));
178 /* The remainder is name. It could be
180 * - "John Doe <john.doe@xz>" (a), or
181 * - "john.doe@xz (John Doe)" (b), or
182 * - "John (zzz) Doe <john.doe@xz> (Comment)" (c)
184 * but we have removed the email part, so
186 * - remove extra spaces which could stay after email (case 'c'), and
187 * - trim from both ends, possibly removing the () pair at the end
188 * (cases 'a' and 'b').
192 if (f
.buf
[0] == '(' && f
.len
&& f
.buf
[f
.len
- 1] == ')') {
193 strbuf_remove(&f
, 0, 1);
194 strbuf_setlen(&f
, f
.len
- 1);
197 get_sane_name(&mi
->name
, &f
, &mi
->email
);
202 static void handle_header(struct strbuf
**out
, const struct strbuf
*line
)
205 *out
= xmalloc(sizeof(struct strbuf
));
206 strbuf_init(*out
, line
->len
);
210 strbuf_addbuf(*out
, line
);
213 /* NOTE NOTE NOTE. We do not claim we do full MIME. We just attempt
214 * to have enough heuristics to grok MIME encoded patches often found
215 * on our mailing lists. For example, we do not even treat header lines
216 * case insensitively.
219 static int slurp_attr(const char *line
, const char *name
, struct strbuf
*attr
)
221 const char *ends
, *ap
= strcasestr(line
, name
);
224 strbuf_setlen(attr
, 0);
234 sz
= strcspn(ap
, ends
);
235 strbuf_add(attr
, ap
, sz
);
239 static int has_attr_value(const char *line
, const char *name
, const char *value
)
241 struct strbuf sb
= STRBUF_INIT
;
242 int rc
= slurp_attr(line
, name
, &sb
) && !strcasecmp(sb
.buf
, value
);
247 static void handle_content_type(struct mailinfo
*mi
, struct strbuf
*line
)
249 struct strbuf
*boundary
= xmalloc(sizeof(struct strbuf
));
250 strbuf_init(boundary
, line
->len
);
252 mi
->format_flowed
= has_attr_value(line
->buf
, "format=", "flowed");
253 mi
->delsp
= has_attr_value(line
->buf
, "delsp=", "yes");
255 if (slurp_attr(line
->buf
, "boundary=", boundary
)) {
256 strbuf_insertstr(boundary
, 0, "--");
257 if (++mi
->content_top
>= &mi
->content
[MAX_BOUNDARIES
]) {
258 error("Too many boundaries to handle");
259 mi
->input_error
= -1;
260 mi
->content_top
= &mi
->content
[MAX_BOUNDARIES
] - 1;
263 *(mi
->content_top
) = boundary
;
266 slurp_attr(line
->buf
, "charset=", &mi
->charset
);
269 strbuf_release(boundary
);
274 static void handle_content_transfer_encoding(struct mailinfo
*mi
,
275 const struct strbuf
*line
)
277 if (strcasestr(line
->buf
, "base64"))
278 mi
->transfer_encoding
= TE_BASE64
;
279 else if (strcasestr(line
->buf
, "quoted-printable"))
280 mi
->transfer_encoding
= TE_QP
;
282 mi
->transfer_encoding
= TE_DONTCARE
;
285 static int is_multipart_boundary(struct mailinfo
*mi
, const struct strbuf
*line
)
287 struct strbuf
*content_top
= *(mi
->content_top
);
289 return ((content_top
->len
<= line
->len
) &&
290 !memcmp(line
->buf
, content_top
->buf
, content_top
->len
));
293 static void cleanup_subject(struct mailinfo
*mi
, struct strbuf
*subject
)
297 while (at
< subject
->len
) {
301 switch (subject
->buf
[at
]) {
303 if (subject
->len
<= at
+ 3)
305 if ((subject
->buf
[at
+ 1] == 'e' ||
306 subject
->buf
[at
+ 1] == 'E') &&
307 subject
->buf
[at
+ 2] == ':') {
308 strbuf_remove(subject
, at
, 3);
313 case ' ': case '\t': case ':':
314 strbuf_remove(subject
, at
, 1);
317 pos
= strchr(subject
->buf
+ at
, ']');
320 remove
= pos
- subject
->buf
+ at
+ 1;
321 if (!mi
->keep_non_patch_brackets_in_subject
||
323 memmem(subject
->buf
+ at
, remove
, "PATCH", 5)))
324 strbuf_remove(subject
, at
, remove
);
328 * If the input had a space after the ], keep
329 * it. We don't bother with finding the end of
330 * the space, since we later normalize it
333 if (isspace(subject
->buf
[at
]))
340 strbuf_trim(subject
);
343 #define MAX_HDR_PARSED 10
344 static const char *header
[MAX_HDR_PARSED
] = {
345 "From","Subject","Date",
348 static inline int skip_header(const struct strbuf
*line
, const char *hdr
,
352 if (!skip_iprefix(line
->buf
, hdr
, &val
) ||
355 while (isspace(*val
))
361 static int is_format_patch_separator(const char *line
, int len
)
363 static const char SAMPLE
[] =
364 "From e6807f3efca28b30decfecb1732a56c7db1137ee Mon Sep 17 00:00:00 2001\n";
367 if (len
!= strlen(SAMPLE
))
369 if (!skip_prefix(line
, "From ", &cp
))
371 if (strspn(cp
, "0123456789abcdef") != 40)
374 return !memcmp(SAMPLE
+ (cp
- line
), cp
, strlen(SAMPLE
) - (cp
- line
));
377 static struct strbuf
*decode_q_segment(const struct strbuf
*q_seg
, int rfc2047
)
379 const char *in
= q_seg
->buf
;
381 struct strbuf
*out
= xmalloc(sizeof(struct strbuf
));
382 strbuf_init(out
, q_seg
->len
);
384 while ((c
= *in
++) != 0) {
388 break; /* drop trailing newline */
391 strbuf_addch(out
, ch
);
395 /* garbage -- fall through */
397 if (rfc2047
&& c
== '_') /* rfc2047 4.2 (2) */
399 strbuf_addch(out
, c
);
404 static struct strbuf
*decode_b_segment(const struct strbuf
*b_seg
)
406 /* Decode in..ep, possibly in-place to ot */
407 int c
, pos
= 0, acc
= 0;
408 const char *in
= b_seg
->buf
;
409 struct strbuf
*out
= xmalloc(sizeof(struct strbuf
));
410 strbuf_init(out
, b_seg
->len
);
412 while ((c
= *in
++) != 0) {
417 else if ('A' <= c
&& c
<= 'Z')
419 else if ('a' <= c
&& c
<= 'z')
421 else if ('0' <= c
&& c
<= '9')
424 continue; /* garbage */
430 strbuf_addch(out
, (acc
| (c
>> 4)));
434 strbuf_addch(out
, (acc
| (c
>> 2)));
438 strbuf_addch(out
, (acc
| c
));
446 static int convert_to_utf8(struct mailinfo
*mi
,
447 struct strbuf
*line
, const char *charset
)
451 if (!mi
->metainfo_charset
|| !charset
|| !*charset
)
454 if (same_encoding(mi
->metainfo_charset
, charset
))
456 out
= reencode_string(line
->buf
, mi
->metainfo_charset
, charset
);
458 mi
->input_error
= -1;
459 return error("cannot convert from %s to %s",
460 charset
, mi
->metainfo_charset
);
462 strbuf_attach(line
, out
, strlen(out
), strlen(out
));
466 static void decode_header(struct mailinfo
*mi
, struct strbuf
*it
)
469 struct strbuf outbuf
= STRBUF_INIT
, *dec
;
470 struct strbuf charset_q
= STRBUF_INIT
, piecebuf
= STRBUF_INIT
;
471 int found_error
= 1; /* pessimism */
474 while (in
- it
->buf
<= it
->len
&& (ep
= strstr(in
, "=?")) != NULL
) {
476 strbuf_reset(&charset_q
);
477 strbuf_reset(&piecebuf
);
481 * We are about to process an encoded-word
482 * that begins at ep, but there is something
483 * before the encoded word.
486 for (scan
= in
; scan
< ep
; scan
++)
490 if (scan
!= ep
|| in
== it
->buf
) {
492 * We should not lose that "something",
493 * unless we have just processed an
494 * encoded-word, and there is only LWS
495 * before the one we are about to process.
497 strbuf_add(&outbuf
, in
, ep
- in
);
501 * ep : "=?iso-2022-jp?B?GyR...?= foo"
502 * ep : "=?ISO-8859-1?Q?Foo=FCbar?= baz"
506 if (ep
- it
->buf
>= it
->len
|| !(cp
= strchr(ep
, '?')))
509 if (cp
+ 3 - it
->buf
> it
->len
)
511 strbuf_add(&charset_q
, ep
, cp
- ep
);
514 if (!encoding
|| cp
[2] != '?')
516 ep
= strstr(cp
+ 3, "?=");
519 strbuf_add(&piecebuf
, cp
+ 3, ep
- cp
- 3);
520 switch (tolower(encoding
)) {
524 dec
= decode_b_segment(&piecebuf
);
527 dec
= decode_q_segment(&piecebuf
, 1);
530 if (convert_to_utf8(mi
, dec
, charset_q
.buf
))
533 strbuf_addbuf(&outbuf
, dec
);
538 strbuf_addstr(&outbuf
, in
);
540 strbuf_addbuf(it
, &outbuf
);
543 strbuf_release(&outbuf
);
544 strbuf_release(&charset_q
);
545 strbuf_release(&piecebuf
);
548 mi
->input_error
= -1;
552 * Returns true if "line" contains a header matching "hdr", in which case "val"
553 * will contain the value of the header with any RFC2047 B and Q encoding
554 * unwrapped, and optionally normalize the meta information to utf8.
556 static int parse_header(const struct strbuf
*line
,
563 if (!skip_header(line
, hdr
, &val_str
))
565 strbuf_addstr(val
, val_str
);
566 decode_header(mi
, val
);
570 static int check_header(struct mailinfo
*mi
,
571 const struct strbuf
*line
,
572 struct strbuf
*hdr_data
[], int overwrite
)
575 struct strbuf sb
= STRBUF_INIT
;
577 /* search for the interesting parts */
578 for (i
= 0; header
[i
]; i
++) {
579 if ((!hdr_data
[i
] || overwrite
) &&
580 parse_header(line
, header
[i
], mi
, &sb
)) {
581 handle_header(&hdr_data
[i
], &sb
);
583 goto check_header_out
;
588 if (parse_header(line
, "Content-Type", mi
, &sb
)) {
589 handle_content_type(mi
, &sb
);
591 goto check_header_out
;
593 if (parse_header(line
, "Content-Transfer-Encoding", mi
, &sb
)) {
594 handle_content_transfer_encoding(mi
, &sb
);
596 goto check_header_out
;
598 if (parse_header(line
, "Message-Id", mi
, &sb
)) {
599 if (mi
->add_message_id
)
600 mi
->message_id
= strbuf_detach(&sb
, NULL
);
602 goto check_header_out
;
611 * Returns 1 if the given line or any line beginning with the given line is an
612 * in-body header (that is, check_header will succeed when passed
615 static int is_inbody_header(const struct mailinfo
*mi
,
616 const struct strbuf
*line
)
620 for (i
= 0; header
[i
]; i
++)
621 if (!mi
->s_hdr_data
[i
] && skip_header(line
, header
[i
], &val
))
626 static void decode_transfer_encoding(struct mailinfo
*mi
, struct strbuf
*line
)
630 switch (mi
->transfer_encoding
) {
632 ret
= decode_q_segment(line
, 0);
635 ret
= decode_b_segment(line
);
642 strbuf_addbuf(line
, ret
);
647 static inline int patchbreak(const struct strbuf
*line
)
651 /* Beginning of a "diff -" header? */
652 if (starts_with(line
->buf
, "diff -"))
655 /* CVS "Index: " line? */
656 if (starts_with(line
->buf
, "Index: "))
660 * "--- <filename>" starts patches without headers
661 * "---<sp>*" is a manual separator
666 if (starts_with(line
->buf
, "---")) {
667 /* space followed by a filename? */
668 if (line
->buf
[3] == ' ' && !isspace(line
->buf
[4]))
670 /* Just whitespace? */
671 for (i
= 3; i
< line
->len
; i
++) {
672 unsigned char c
= line
->buf
[i
];
683 static int is_scissors_line(const char *line
)
686 int scissors
= 0, gap
= 0;
687 const char *first_nonblank
= NULL
, *last_nonblank
= NULL
;
688 int visible
, perforation
= 0, in_perforation
= 0;
690 for (c
= line
; *c
; c
++) {
692 if (in_perforation
) {
699 if (first_nonblank
== NULL
)
706 if ((!memcmp(c
, ">8", 2) || !memcmp(c
, "8<", 2) ||
707 !memcmp(c
, ">%", 2) || !memcmp(c
, "%<", 2))) {
718 * The mark must be at least 8 bytes long (e.g. "-- >8 --").
719 * Even though there can be arbitrary cruft on the same line
720 * (e.g. "cut here"), in order to avoid misidentification, the
721 * perforation must occupy more than a third of the visible
722 * width of the line, and dashes and scissors must occupy more
723 * than half of the perforation.
726 if (first_nonblank
&& last_nonblank
)
727 visible
= last_nonblank
- first_nonblank
+ 1;
730 return (scissors
&& 8 <= visible
&&
731 visible
< perforation
* 3 &&
732 gap
* 2 < perforation
);
735 static void flush_inbody_header_accum(struct mailinfo
*mi
)
737 if (!mi
->inbody_header_accum
.len
)
739 if (!check_header(mi
, &mi
->inbody_header_accum
, mi
->s_hdr_data
, 0))
740 BUG("inbody_header_accum, if not empty, must always contain a valid in-body header");
741 strbuf_reset(&mi
->inbody_header_accum
);
744 static int check_inbody_header(struct mailinfo
*mi
, const struct strbuf
*line
)
746 if (mi
->inbody_header_accum
.len
&&
747 (line
->buf
[0] == ' ' || line
->buf
[0] == '\t')) {
748 if (mi
->use_scissors
&& is_scissors_line(line
->buf
)) {
750 * This is a scissors line; do not consider this line
751 * as a header continuation line.
753 flush_inbody_header_accum(mi
);
756 strbuf_strip_suffix(&mi
->inbody_header_accum
, "\n");
757 strbuf_addbuf(&mi
->inbody_header_accum
, line
);
761 flush_inbody_header_accum(mi
);
763 if (starts_with(line
->buf
, ">From") && isspace(line
->buf
[5]))
764 return is_format_patch_separator(line
->buf
+ 1, line
->len
- 1);
765 if (starts_with(line
->buf
, "[PATCH]") && isspace(line
->buf
[7])) {
767 for (i
= 0; header
[i
]; i
++)
768 if (!strcmp("Subject", header
[i
])) {
769 handle_header(&mi
->s_hdr_data
[i
], line
);
774 if (is_inbody_header(mi
, line
)) {
775 strbuf_addbuf(&mi
->inbody_header_accum
, line
);
781 static int handle_commit_msg(struct mailinfo
*mi
, struct strbuf
*line
)
783 assert(!mi
->filter_stage
);
785 if (mi
->header_stage
) {
786 if (!line
->len
|| (line
->len
== 1 && line
->buf
[0] == '\n')) {
787 if (mi
->inbody_header_accum
.len
) {
788 flush_inbody_header_accum(mi
);
789 mi
->header_stage
= 0;
795 if (mi
->use_inbody_headers
&& mi
->header_stage
) {
796 mi
->header_stage
= check_inbody_header(mi
, line
);
797 if (mi
->header_stage
)
800 /* Only trim the first (blank) line of the commit message
801 * when ignoring in-body headers.
803 mi
->header_stage
= 0;
805 /* normalize the log message to UTF-8. */
806 if (convert_to_utf8(mi
, line
, mi
->charset
.buf
))
807 return 0; /* mi->input_error already set */
809 if (mi
->use_scissors
&& is_scissors_line(line
->buf
)) {
812 strbuf_setlen(&mi
->log_message
, 0);
813 mi
->header_stage
= 1;
816 * We may have already read "secondary headers"; purge
817 * them to give ourselves a clean restart.
819 for (i
= 0; header
[i
]; i
++) {
820 if (mi
->s_hdr_data
[i
])
821 strbuf_release(mi
->s_hdr_data
[i
]);
822 mi
->s_hdr_data
[i
] = NULL
;
827 if (patchbreak(line
)) {
829 strbuf_addf(&mi
->log_message
,
830 "Message-Id: %s\n", mi
->message_id
);
834 strbuf_addbuf(&mi
->log_message
, line
);
838 static void handle_patch(struct mailinfo
*mi
, const struct strbuf
*line
)
840 fwrite(line
->buf
, 1, line
->len
, mi
->patchfile
);
844 static void handle_filter(struct mailinfo
*mi
, struct strbuf
*line
)
846 switch (mi
->filter_stage
) {
848 if (!handle_commit_msg(mi
, line
))
853 handle_patch(mi
, line
);
858 static int is_rfc2822_header(const struct strbuf
*line
)
861 * The section that defines the loosest possible
862 * field name is "3.6.8 Optional fields".
864 * optional-field = field-name ":" unstructured CRLF
865 * field-name = 1*ftext
866 * ftext = %d33-57 / %59-126
869 char *cp
= line
->buf
;
871 /* Count mbox From headers as headers */
872 if (starts_with(cp
, "From ") || starts_with(cp
, ">From "))
875 while ((ch
= *cp
++)) {
878 if ((33 <= ch
&& ch
<= 57) ||
879 (59 <= ch
&& ch
<= 126))
886 static int read_one_header_line(struct strbuf
*line
, FILE *in
)
888 struct strbuf continuation
= STRBUF_INIT
;
890 /* Get the first part of the line. */
891 if (strbuf_getline_lf(line
, in
))
895 * Is it an empty line or not a valid rfc2822 header?
896 * If so, stop here, and return false ("not a header")
899 if (!line
->len
|| !is_rfc2822_header(line
)) {
900 /* Re-add the newline */
901 strbuf_addch(line
, '\n');
906 * Now we need to eat all the continuation lines..
907 * Yuck, 2822 header "folding"
916 if (peek
!= ' ' && peek
!= '\t')
918 if (strbuf_getline_lf(&continuation
, in
))
920 continuation
.buf
[0] = ' ';
921 strbuf_rtrim(&continuation
);
922 strbuf_addbuf(line
, &continuation
);
924 strbuf_release(&continuation
);
929 static int find_boundary(struct mailinfo
*mi
, struct strbuf
*line
)
931 while (!strbuf_getline_lf(line
, mi
->input
)) {
932 if (*(mi
->content_top
) && is_multipart_boundary(mi
, line
))
938 static int handle_boundary(struct mailinfo
*mi
, struct strbuf
*line
)
940 struct strbuf newline
= STRBUF_INIT
;
942 strbuf_addch(&newline
, '\n');
944 if (line
->len
>= (*(mi
->content_top
))->len
+ 2 &&
945 !memcmp(line
->buf
+ (*(mi
->content_top
))->len
, "--", 2)) {
946 /* we hit an end boundary */
947 /* pop the current boundary off the stack */
948 strbuf_release(*(mi
->content_top
));
949 FREE_AND_NULL(*(mi
->content_top
));
951 /* technically won't happen as is_multipart_boundary()
952 will fail first. But just in case..
954 if (--mi
->content_top
< mi
->content
) {
955 error("Detected mismatched boundaries, can't recover");
956 mi
->input_error
= -1;
957 mi
->content_top
= mi
->content
;
958 strbuf_release(&newline
);
961 handle_filter(mi
, &newline
);
962 strbuf_release(&newline
);
966 /* skip to the next boundary */
967 if (!find_boundary(mi
, line
))
972 /* set some defaults */
973 mi
->transfer_encoding
= TE_DONTCARE
;
974 strbuf_reset(&mi
->charset
);
976 /* slurp in this section's info */
977 while (read_one_header_line(line
, mi
->input
))
978 check_header(mi
, line
, mi
->p_hdr_data
, 0);
980 strbuf_release(&newline
);
982 if (strbuf_getline_lf(line
, mi
->input
))
984 strbuf_addch(line
, '\n');
988 static void handle_filter_flowed(struct mailinfo
*mi
, struct strbuf
*line
,
991 size_t len
= line
->len
;
994 if (!mi
->format_flowed
) {
995 handle_filter(mi
, line
);
999 if (line
->buf
[len
- 1] == '\n') {
1001 if (len
&& line
->buf
[len
- 1] == '\r')
1005 /* Keep signature separator as-is. */
1006 if (skip_prefix(line
->buf
, "-- ", &rest
) && rest
- line
->buf
== len
) {
1008 handle_filter(mi
, prev
);
1011 handle_filter(mi
, line
);
1015 /* Unstuff space-stuffed line. */
1016 if (len
&& line
->buf
[0] == ' ') {
1017 strbuf_remove(line
, 0, 1);
1021 /* Save flowed line for later, but without the soft line break. */
1022 if (len
&& line
->buf
[len
- 1] == ' ') {
1023 strbuf_add(prev
, line
->buf
, len
- !!mi
->delsp
);
1027 /* Prepend any previous partial lines */
1028 strbuf_insert(line
, 0, prev
->buf
, prev
->len
);
1031 handle_filter(mi
, line
);
1034 static void handle_body(struct mailinfo
*mi
, struct strbuf
*line
)
1036 struct strbuf prev
= STRBUF_INIT
;
1038 /* Skip up to the first boundary */
1039 if (*(mi
->content_top
)) {
1040 if (!find_boundary(mi
, line
))
1041 goto handle_body_out
;
1045 /* process any boundary lines */
1046 if (*(mi
->content_top
) && is_multipart_boundary(mi
, line
)) {
1047 /* flush any leftover */
1049 handle_filter(mi
, &prev
);
1050 strbuf_reset(&prev
);
1052 if (!handle_boundary(mi
, line
))
1053 goto handle_body_out
;
1056 /* Unwrap transfer encoding */
1057 decode_transfer_encoding(mi
, line
);
1059 switch (mi
->transfer_encoding
) {
1063 struct strbuf
**lines
, **it
, *sb
;
1065 /* Prepend any previous partial lines */
1066 strbuf_insert(line
, 0, prev
.buf
, prev
.len
);
1067 strbuf_reset(&prev
);
1070 * This is a decoded line that may contain
1071 * multiple new lines. Pass only one chunk
1072 * at a time to handle_filter()
1074 lines
= strbuf_split(line
, '\n');
1075 for (it
= lines
; (sb
= *it
); it
++) {
1076 if (*(it
+ 1) == NULL
) /* The last line */
1077 if (sb
->buf
[sb
->len
- 1] != '\n') {
1078 /* Partial line, save it for later. */
1079 strbuf_addbuf(&prev
, sb
);
1082 handle_filter_flowed(mi
, sb
, &prev
);
1085 * The partial chunk is saved in "prev" and will be
1086 * appended by the next iteration of read_line_with_nul().
1088 strbuf_list_free(lines
);
1092 handle_filter_flowed(mi
, line
, &prev
);
1095 if (mi
->input_error
)
1097 } while (!strbuf_getwholeline(line
, mi
->input
, '\n'));
1100 handle_filter(mi
, &prev
);
1102 flush_inbody_header_accum(mi
);
1105 strbuf_release(&prev
);
1108 static void output_header_lines(FILE *fout
, const char *hdr
, const struct strbuf
*data
)
1110 const char *sp
= data
->buf
;
1112 char *ep
= strchr(sp
, '\n');
1118 fprintf(fout
, "%s: %.*s\n", hdr
, len
, sp
);
1125 static void handle_info(struct mailinfo
*mi
)
1130 for (i
= 0; header
[i
]; i
++) {
1131 /* only print inbody headers if we output a patch file */
1132 if (mi
->patch_lines
&& mi
->s_hdr_data
[i
])
1133 hdr
= mi
->s_hdr_data
[i
];
1134 else if (mi
->p_hdr_data
[i
])
1135 hdr
= mi
->p_hdr_data
[i
];
1139 if (!strcmp(header
[i
], "Subject")) {
1140 if (!mi
->keep_subject
) {
1141 cleanup_subject(mi
, hdr
);
1144 output_header_lines(mi
->output
, "Subject", hdr
);
1145 } else if (!strcmp(header
[i
], "From")) {
1147 handle_from(mi
, hdr
);
1148 fprintf(mi
->output
, "Author: %s\n", mi
->name
.buf
);
1149 fprintf(mi
->output
, "Email: %s\n", mi
->email
.buf
);
1152 fprintf(mi
->output
, "%s: %s\n", header
[i
], hdr
->buf
);
1155 fprintf(mi
->output
, "\n");
1158 int mailinfo(struct mailinfo
*mi
, const char *msg
, const char *patch
)
1162 struct strbuf line
= STRBUF_INIT
;
1164 cmitmsg
= fopen(msg
, "w");
1169 mi
->patchfile
= fopen(patch
, "w");
1170 if (!mi
->patchfile
) {
1176 mi
->p_hdr_data
= xcalloc(MAX_HDR_PARSED
, sizeof(*(mi
->p_hdr_data
)));
1177 mi
->s_hdr_data
= xcalloc(MAX_HDR_PARSED
, sizeof(*(mi
->s_hdr_data
)));
1180 peek
= fgetc(mi
->input
);
1183 return error("empty patch: '%s'", patch
);
1185 } while (isspace(peek
));
1186 ungetc(peek
, mi
->input
);
1188 /* process the email header */
1189 while (read_one_header_line(&line
, mi
->input
))
1190 check_header(mi
, &line
, mi
->p_hdr_data
, 1);
1192 handle_body(mi
, &line
);
1193 fwrite(mi
->log_message
.buf
, 1, mi
->log_message
.len
, cmitmsg
);
1195 fclose(mi
->patchfile
);
1198 strbuf_release(&line
);
1199 return mi
->input_error
;
1202 static int git_mailinfo_config(const char *var
, const char *value
, void *mi_
)
1204 struct mailinfo
*mi
= mi_
;
1206 if (!starts_with(var
, "mailinfo."))
1207 return git_default_config(var
, value
, NULL
);
1208 if (!strcmp(var
, "mailinfo.scissors")) {
1209 mi
->use_scissors
= git_config_bool(var
, value
);
1212 /* perhaps others here */
1216 void setup_mailinfo(struct mailinfo
*mi
)
1218 memset(mi
, 0, sizeof(*mi
));
1219 strbuf_init(&mi
->name
, 0);
1220 strbuf_init(&mi
->email
, 0);
1221 strbuf_init(&mi
->charset
, 0);
1222 strbuf_init(&mi
->log_message
, 0);
1223 strbuf_init(&mi
->inbody_header_accum
, 0);
1224 mi
->header_stage
= 1;
1225 mi
->use_inbody_headers
= 1;
1226 mi
->content_top
= mi
->content
;
1227 git_config(git_mailinfo_config
, mi
);
1230 void clear_mailinfo(struct mailinfo
*mi
)
1234 strbuf_release(&mi
->name
);
1235 strbuf_release(&mi
->email
);
1236 strbuf_release(&mi
->charset
);
1237 strbuf_release(&mi
->inbody_header_accum
);
1238 free(mi
->message_id
);
1241 for (i
= 0; mi
->p_hdr_data
[i
]; i
++)
1242 strbuf_release(mi
->p_hdr_data
[i
]);
1243 free(mi
->p_hdr_data
);
1245 for (i
= 0; mi
->s_hdr_data
[i
]; i
++)
1246 strbuf_release(mi
->s_hdr_data
[i
]);
1247 free(mi
->s_hdr_data
);
1249 while (mi
->content
< mi
->content_top
) {
1250 free(*(mi
->content_top
));
1254 strbuf_release(&mi
->log_message
);