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
|| strchr(name
->buf
, '@') ||
23 strchr(name
->buf
, '<') || strchr(name
->buf
, '>'))
28 strbuf_addbuf(out
, src
);
31 static void parse_bogus_from(struct mailinfo
*mi
, const struct strbuf
*line
)
33 /* John Doe <johndoe> */
36 /* This is fallback, so do not bother if we already have an
42 bra
= strchr(line
->buf
, '<');
45 ket
= strchr(bra
, '>');
49 strbuf_reset(&mi
->email
);
50 strbuf_add(&mi
->email
, bra
+ 1, ket
- bra
- 1);
52 strbuf_reset(&mi
->name
);
53 strbuf_add(&mi
->name
, line
->buf
, bra
- line
->buf
);
54 strbuf_trim(&mi
->name
);
55 get_sane_name(&mi
->name
, &mi
->name
, &mi
->email
);
58 static const char *unquote_comment(struct strbuf
*outbuf
, const char *in
)
61 int take_next_literally
= 0;
63 strbuf_addch(outbuf
, '(');
65 while ((c
= *in
++) != 0) {
66 if (take_next_literally
== 1) {
67 take_next_literally
= 0;
71 take_next_literally
= 1;
74 in
= unquote_comment(outbuf
, in
);
77 strbuf_addch(outbuf
, ')');
82 strbuf_addch(outbuf
, c
);
88 static const char *unquote_quoted_string(struct strbuf
*outbuf
, const char *in
)
91 int take_next_literally
= 0;
93 while ((c
= *in
++) != 0) {
94 if (take_next_literally
== 1) {
95 take_next_literally
= 0;
99 take_next_literally
= 1;
106 strbuf_addch(outbuf
, c
);
112 static void unquote_quoted_pair(struct strbuf
*line
)
114 struct strbuf outbuf
;
115 const char *in
= line
->buf
;
118 strbuf_init(&outbuf
, line
->len
);
120 while ((c
= *in
++) != 0) {
123 in
= unquote_quoted_string(&outbuf
, in
);
126 in
= unquote_comment(&outbuf
, in
);
130 strbuf_addch(&outbuf
, c
);
133 strbuf_swap(&outbuf
, line
);
134 strbuf_release(&outbuf
);
138 static void handle_from(struct mailinfo
*mi
, const struct strbuf
*from
)
144 strbuf_init(&f
, from
->len
);
145 strbuf_addbuf(&f
, from
);
147 unquote_quoted_pair(&f
);
149 at
= strchr(f
.buf
, '@');
151 parse_bogus_from(mi
, from
);
156 * If we already have one email, don't take any confusing lines
158 if (mi
->email
.len
&& strchr(at
+ 1, '@'))
161 /* Pick up the string around '@', possibly delimited with <>
162 * pair; that is the email part.
174 el
= strcspn(at
, " \n\t\r\v\f>");
175 strbuf_reset(&mi
->email
);
176 strbuf_add(&mi
->email
, at
, el
);
177 strbuf_remove(&f
, at
- f
.buf
, el
+ (at
[el
] ? 1 : 0));
179 /* The remainder is name. It could be
181 * - "John Doe <john.doe@xz>" (a), or
182 * - "john.doe@xz (John Doe)" (b), or
183 * - "John (zzz) Doe <john.doe@xz> (Comment)" (c)
185 * but we have removed the email part, so
187 * - remove extra spaces which could stay after email (case 'c'), and
188 * - trim from both ends, possibly removing the () pair at the end
189 * (cases 'a' and 'b').
193 if (f
.buf
[0] == '(' && f
.len
&& f
.buf
[f
.len
- 1] == ')') {
194 strbuf_remove(&f
, 0, 1);
195 strbuf_setlen(&f
, f
.len
- 1);
198 get_sane_name(&mi
->name
, &f
, &mi
->email
);
203 static void handle_header(struct strbuf
**out
, const struct strbuf
*line
)
206 *out
= xmalloc(sizeof(struct strbuf
));
207 strbuf_init(*out
, line
->len
);
211 strbuf_addbuf(*out
, line
);
214 /* NOTE NOTE NOTE. We do not claim we do full MIME. We just attempt
215 * to have enough heuristics to grok MIME encoded patches often found
216 * on our mailing lists. For example, we do not even treat header lines
217 * case insensitively.
220 static int slurp_attr(const char *line
, const char *name
, struct strbuf
*attr
)
222 const char *ends
, *ap
= strcasestr(line
, name
);
225 strbuf_setlen(attr
, 0);
235 sz
= strcspn(ap
, ends
);
236 strbuf_add(attr
, ap
, sz
);
240 static void handle_content_type(struct mailinfo
*mi
, struct strbuf
*line
)
242 struct strbuf
*boundary
= xmalloc(sizeof(struct strbuf
));
243 strbuf_init(boundary
, line
->len
);
245 if (slurp_attr(line
->buf
, "boundary=", boundary
)) {
246 strbuf_insert(boundary
, 0, "--", 2);
247 if (++mi
->content_top
>= &mi
->content
[MAX_BOUNDARIES
]) {
248 error("Too many boundaries to handle");
249 mi
->input_error
= -1;
250 mi
->content_top
= &mi
->content
[MAX_BOUNDARIES
] - 1;
253 *(mi
->content_top
) = boundary
;
256 slurp_attr(line
->buf
, "charset=", &mi
->charset
);
259 strbuf_release(boundary
);
264 static void handle_content_transfer_encoding(struct mailinfo
*mi
,
265 const struct strbuf
*line
)
267 if (strcasestr(line
->buf
, "base64"))
268 mi
->transfer_encoding
= TE_BASE64
;
269 else if (strcasestr(line
->buf
, "quoted-printable"))
270 mi
->transfer_encoding
= TE_QP
;
272 mi
->transfer_encoding
= TE_DONTCARE
;
275 static int is_multipart_boundary(struct mailinfo
*mi
, const struct strbuf
*line
)
277 struct strbuf
*content_top
= *(mi
->content_top
);
279 return ((content_top
->len
<= line
->len
) &&
280 !memcmp(line
->buf
, content_top
->buf
, content_top
->len
));
283 static void cleanup_subject(struct mailinfo
*mi
, struct strbuf
*subject
)
287 while (at
< subject
->len
) {
291 switch (subject
->buf
[at
]) {
293 if (subject
->len
<= at
+ 3)
295 if ((subject
->buf
[at
+ 1] == 'e' ||
296 subject
->buf
[at
+ 1] == 'E') &&
297 subject
->buf
[at
+ 2] == ':') {
298 strbuf_remove(subject
, at
, 3);
303 case ' ': case '\t': case ':':
304 strbuf_remove(subject
, at
, 1);
307 pos
= strchr(subject
->buf
+ at
, ']');
310 remove
= pos
- subject
->buf
+ at
+ 1;
311 if (!mi
->keep_non_patch_brackets_in_subject
||
313 memmem(subject
->buf
+ at
, remove
, "PATCH", 5)))
314 strbuf_remove(subject
, at
, remove
);
318 * If the input had a space after the ], keep
319 * it. We don't bother with finding the end of
320 * the space, since we later normalize it
323 if (isspace(subject
->buf
[at
]))
330 strbuf_trim(subject
);
333 #define MAX_HDR_PARSED 10
334 static const char *header
[MAX_HDR_PARSED
] = {
335 "From","Subject","Date",
338 static inline int cmp_header(const struct strbuf
*line
, const char *hdr
)
340 int len
= strlen(hdr
);
341 return !strncasecmp(line
->buf
, hdr
, len
) && line
->len
> len
&&
342 line
->buf
[len
] == ':' && isspace(line
->buf
[len
+ 1]);
345 static int is_format_patch_separator(const char *line
, int len
)
347 static const char SAMPLE
[] =
348 "From e6807f3efca28b30decfecb1732a56c7db1137ee Mon Sep 17 00:00:00 2001\n";
351 if (len
!= strlen(SAMPLE
))
353 if (!skip_prefix(line
, "From ", &cp
))
355 if (strspn(cp
, "0123456789abcdef") != 40)
358 return !memcmp(SAMPLE
+ (cp
- line
), cp
, strlen(SAMPLE
) - (cp
- line
));
361 static struct strbuf
*decode_q_segment(const struct strbuf
*q_seg
, int rfc2047
)
363 const char *in
= q_seg
->buf
;
365 struct strbuf
*out
= xmalloc(sizeof(struct strbuf
));
366 strbuf_init(out
, q_seg
->len
);
368 while ((c
= *in
++) != 0) {
372 break; /* drop trailing newline */
375 strbuf_addch(out
, ch
);
379 /* garbage -- fall through */
381 if (rfc2047
&& c
== '_') /* rfc2047 4.2 (2) */
383 strbuf_addch(out
, c
);
388 static struct strbuf
*decode_b_segment(const struct strbuf
*b_seg
)
390 /* Decode in..ep, possibly in-place to ot */
391 int c
, pos
= 0, acc
= 0;
392 const char *in
= b_seg
->buf
;
393 struct strbuf
*out
= xmalloc(sizeof(struct strbuf
));
394 strbuf_init(out
, b_seg
->len
);
396 while ((c
= *in
++) != 0) {
401 else if ('A' <= c
&& c
<= 'Z')
403 else if ('a' <= c
&& c
<= 'z')
405 else if ('0' <= c
&& c
<= '9')
408 continue; /* garbage */
414 strbuf_addch(out
, (acc
| (c
>> 4)));
418 strbuf_addch(out
, (acc
| (c
>> 2)));
422 strbuf_addch(out
, (acc
| c
));
430 static int convert_to_utf8(struct mailinfo
*mi
,
431 struct strbuf
*line
, const char *charset
)
435 if (!mi
->metainfo_charset
|| !charset
|| !*charset
)
438 if (same_encoding(mi
->metainfo_charset
, charset
))
440 out
= reencode_string(line
->buf
, mi
->metainfo_charset
, charset
);
442 mi
->input_error
= -1;
443 return error("cannot convert from %s to %s",
444 charset
, mi
->metainfo_charset
);
446 strbuf_attach(line
, out
, strlen(out
), strlen(out
));
450 static void decode_header(struct mailinfo
*mi
, struct strbuf
*it
)
453 struct strbuf outbuf
= STRBUF_INIT
, *dec
;
454 struct strbuf charset_q
= STRBUF_INIT
, piecebuf
= STRBUF_INIT
;
455 int found_error
= 1; /* pessimism */
458 while (in
- it
->buf
<= it
->len
&& (ep
= strstr(in
, "=?")) != NULL
) {
460 strbuf_reset(&charset_q
);
461 strbuf_reset(&piecebuf
);
465 * We are about to process an encoded-word
466 * that begins at ep, but there is something
467 * before the encoded word.
470 for (scan
= in
; scan
< ep
; scan
++)
474 if (scan
!= ep
|| in
== it
->buf
) {
476 * We should not lose that "something",
477 * unless we have just processed an
478 * encoded-word, and there is only LWS
479 * before the one we are about to process.
481 strbuf_add(&outbuf
, in
, ep
- in
);
485 * ep : "=?iso-2022-jp?B?GyR...?= foo"
486 * ep : "=?ISO-8859-1?Q?Foo=FCbar?= baz"
490 if (ep
- it
->buf
>= it
->len
|| !(cp
= strchr(ep
, '?')))
493 if (cp
+ 3 - it
->buf
> it
->len
)
495 strbuf_add(&charset_q
, ep
, cp
- ep
);
498 if (!encoding
|| cp
[2] != '?')
500 ep
= strstr(cp
+ 3, "?=");
503 strbuf_add(&piecebuf
, cp
+ 3, ep
- cp
- 3);
504 switch (tolower(encoding
)) {
508 dec
= decode_b_segment(&piecebuf
);
511 dec
= decode_q_segment(&piecebuf
, 1);
514 if (convert_to_utf8(mi
, dec
, charset_q
.buf
))
517 strbuf_addbuf(&outbuf
, dec
);
522 strbuf_addstr(&outbuf
, in
);
524 strbuf_addbuf(it
, &outbuf
);
527 strbuf_release(&outbuf
);
528 strbuf_release(&charset_q
);
529 strbuf_release(&piecebuf
);
532 mi
->input_error
= -1;
535 static int check_header(struct mailinfo
*mi
,
536 const struct strbuf
*line
,
537 struct strbuf
*hdr_data
[], int overwrite
)
540 struct strbuf sb
= STRBUF_INIT
;
542 /* search for the interesting parts */
543 for (i
= 0; header
[i
]; i
++) {
544 int len
= strlen(header
[i
]);
545 if ((!hdr_data
[i
] || overwrite
) && cmp_header(line
, header
[i
])) {
546 /* Unwrap inline B and Q encoding, and optionally
547 * normalize the meta information to utf8.
549 strbuf_add(&sb
, line
->buf
+ len
+ 2, line
->len
- len
- 2);
550 decode_header(mi
, &sb
);
551 handle_header(&hdr_data
[i
], &sb
);
553 goto check_header_out
;
558 if (cmp_header(line
, "Content-Type")) {
559 len
= strlen("Content-Type: ");
560 strbuf_add(&sb
, line
->buf
+ len
, line
->len
- len
);
561 decode_header(mi
, &sb
);
562 strbuf_insert(&sb
, 0, "Content-Type: ", len
);
563 handle_content_type(mi
, &sb
);
565 goto check_header_out
;
567 if (cmp_header(line
, "Content-Transfer-Encoding")) {
568 len
= strlen("Content-Transfer-Encoding: ");
569 strbuf_add(&sb
, line
->buf
+ len
, line
->len
- len
);
570 decode_header(mi
, &sb
);
571 handle_content_transfer_encoding(mi
, &sb
);
573 goto check_header_out
;
575 if (cmp_header(line
, "Message-Id")) {
576 len
= strlen("Message-Id: ");
577 strbuf_add(&sb
, line
->buf
+ len
, line
->len
- len
);
578 decode_header(mi
, &sb
);
579 if (mi
->add_message_id
)
580 mi
->message_id
= strbuf_detach(&sb
, NULL
);
582 goto check_header_out
;
591 * Returns 1 if the given line or any line beginning with the given line is an
592 * in-body header (that is, check_header will succeed when passed
595 static int is_inbody_header(const struct mailinfo
*mi
,
596 const struct strbuf
*line
)
599 for (i
= 0; header
[i
]; i
++)
600 if (!mi
->s_hdr_data
[i
] && cmp_header(line
, header
[i
]))
605 static void decode_transfer_encoding(struct mailinfo
*mi
, struct strbuf
*line
)
609 switch (mi
->transfer_encoding
) {
611 ret
= decode_q_segment(line
, 0);
614 ret
= decode_b_segment(line
);
621 strbuf_addbuf(line
, ret
);
626 static inline int patchbreak(const struct strbuf
*line
)
630 /* Beginning of a "diff -" header? */
631 if (starts_with(line
->buf
, "diff -"))
634 /* CVS "Index: " line? */
635 if (starts_with(line
->buf
, "Index: "))
639 * "--- <filename>" starts patches without headers
640 * "---<sp>*" is a manual separator
645 if (starts_with(line
->buf
, "---")) {
646 /* space followed by a filename? */
647 if (line
->buf
[3] == ' ' && !isspace(line
->buf
[4]))
649 /* Just whitespace? */
650 for (i
= 3; i
< line
->len
; i
++) {
651 unsigned char c
= line
->buf
[i
];
662 static int is_scissors_line(const char *line
)
665 int scissors
= 0, gap
= 0;
666 const char *first_nonblank
= NULL
, *last_nonblank
= NULL
;
667 int visible
, perforation
= 0, in_perforation
= 0;
669 for (c
= line
; *c
; c
++) {
671 if (in_perforation
) {
678 if (first_nonblank
== NULL
)
685 if ((!memcmp(c
, ">8", 2) || !memcmp(c
, "8<", 2) ||
686 !memcmp(c
, ">%", 2) || !memcmp(c
, "%<", 2))) {
697 * The mark must be at least 8 bytes long (e.g. "-- >8 --").
698 * Even though there can be arbitrary cruft on the same line
699 * (e.g. "cut here"), in order to avoid misidentification, the
700 * perforation must occupy more than a third of the visible
701 * width of the line, and dashes and scissors must occupy more
702 * than half of the perforation.
705 if (first_nonblank
&& last_nonblank
)
706 visible
= last_nonblank
- first_nonblank
+ 1;
709 return (scissors
&& 8 <= visible
&&
710 visible
< perforation
* 3 &&
711 gap
* 2 < perforation
);
714 static void flush_inbody_header_accum(struct mailinfo
*mi
)
716 if (!mi
->inbody_header_accum
.len
)
718 if (!check_header(mi
, &mi
->inbody_header_accum
, mi
->s_hdr_data
, 0))
719 BUG("inbody_header_accum, if not empty, must always contain a valid in-body header");
720 strbuf_reset(&mi
->inbody_header_accum
);
723 static int check_inbody_header(struct mailinfo
*mi
, const struct strbuf
*line
)
725 if (mi
->inbody_header_accum
.len
&&
726 (line
->buf
[0] == ' ' || line
->buf
[0] == '\t')) {
727 if (mi
->use_scissors
&& is_scissors_line(line
->buf
)) {
729 * This is a scissors line; do not consider this line
730 * as a header continuation line.
732 flush_inbody_header_accum(mi
);
735 strbuf_strip_suffix(&mi
->inbody_header_accum
, "\n");
736 strbuf_addbuf(&mi
->inbody_header_accum
, line
);
740 flush_inbody_header_accum(mi
);
742 if (starts_with(line
->buf
, ">From") && isspace(line
->buf
[5]))
743 return is_format_patch_separator(line
->buf
+ 1, line
->len
- 1);
744 if (starts_with(line
->buf
, "[PATCH]") && isspace(line
->buf
[7])) {
746 for (i
= 0; header
[i
]; i
++)
747 if (!strcmp("Subject", header
[i
])) {
748 handle_header(&mi
->s_hdr_data
[i
], line
);
753 if (is_inbody_header(mi
, line
)) {
754 strbuf_addbuf(&mi
->inbody_header_accum
, line
);
760 static int handle_commit_msg(struct mailinfo
*mi
, struct strbuf
*line
)
762 assert(!mi
->filter_stage
);
764 if (mi
->header_stage
) {
765 if (!line
->len
|| (line
->len
== 1 && line
->buf
[0] == '\n')) {
766 if (mi
->inbody_header_accum
.len
) {
767 flush_inbody_header_accum(mi
);
768 mi
->header_stage
= 0;
774 if (mi
->use_inbody_headers
&& mi
->header_stage
) {
775 mi
->header_stage
= check_inbody_header(mi
, line
);
776 if (mi
->header_stage
)
779 /* Only trim the first (blank) line of the commit message
780 * when ignoring in-body headers.
782 mi
->header_stage
= 0;
784 /* normalize the log message to UTF-8. */
785 if (convert_to_utf8(mi
, line
, mi
->charset
.buf
))
786 return 0; /* mi->input_error already set */
788 if (mi
->use_scissors
&& is_scissors_line(line
->buf
)) {
791 strbuf_setlen(&mi
->log_message
, 0);
792 mi
->header_stage
= 1;
795 * We may have already read "secondary headers"; purge
796 * them to give ourselves a clean restart.
798 for (i
= 0; header
[i
]; i
++) {
799 if (mi
->s_hdr_data
[i
])
800 strbuf_release(mi
->s_hdr_data
[i
]);
801 mi
->s_hdr_data
[i
] = NULL
;
806 if (patchbreak(line
)) {
808 strbuf_addf(&mi
->log_message
,
809 "Message-Id: %s\n", mi
->message_id
);
813 strbuf_addbuf(&mi
->log_message
, line
);
817 static void handle_patch(struct mailinfo
*mi
, const struct strbuf
*line
)
819 fwrite(line
->buf
, 1, line
->len
, mi
->patchfile
);
823 static void handle_filter(struct mailinfo
*mi
, struct strbuf
*line
)
825 switch (mi
->filter_stage
) {
827 if (!handle_commit_msg(mi
, line
))
832 handle_patch(mi
, line
);
837 static int is_rfc2822_header(const struct strbuf
*line
)
840 * The section that defines the loosest possible
841 * field name is "3.6.8 Optional fields".
843 * optional-field = field-name ":" unstructured CRLF
844 * field-name = 1*ftext
845 * ftext = %d33-57 / %59-126
848 char *cp
= line
->buf
;
850 /* Count mbox From headers as headers */
851 if (starts_with(cp
, "From ") || starts_with(cp
, ">From "))
854 while ((ch
= *cp
++)) {
857 if ((33 <= ch
&& ch
<= 57) ||
858 (59 <= ch
&& ch
<= 126))
865 static int read_one_header_line(struct strbuf
*line
, FILE *in
)
867 struct strbuf continuation
= STRBUF_INIT
;
869 /* Get the first part of the line. */
870 if (strbuf_getline_lf(line
, in
))
874 * Is it an empty line or not a valid rfc2822 header?
875 * If so, stop here, and return false ("not a header")
878 if (!line
->len
|| !is_rfc2822_header(line
)) {
879 /* Re-add the newline */
880 strbuf_addch(line
, '\n');
885 * Now we need to eat all the continuation lines..
886 * Yuck, 2822 header "folding"
895 if (peek
!= ' ' && peek
!= '\t')
897 if (strbuf_getline_lf(&continuation
, in
))
899 continuation
.buf
[0] = ' ';
900 strbuf_rtrim(&continuation
);
901 strbuf_addbuf(line
, &continuation
);
903 strbuf_release(&continuation
);
908 static int find_boundary(struct mailinfo
*mi
, struct strbuf
*line
)
910 while (!strbuf_getline_lf(line
, mi
->input
)) {
911 if (*(mi
->content_top
) && is_multipart_boundary(mi
, line
))
917 static int handle_boundary(struct mailinfo
*mi
, struct strbuf
*line
)
919 struct strbuf newline
= STRBUF_INIT
;
921 strbuf_addch(&newline
, '\n');
923 if (line
->len
>= (*(mi
->content_top
))->len
+ 2 &&
924 !memcmp(line
->buf
+ (*(mi
->content_top
))->len
, "--", 2)) {
925 /* we hit an end boundary */
926 /* pop the current boundary off the stack */
927 strbuf_release(*(mi
->content_top
));
928 FREE_AND_NULL(*(mi
->content_top
));
930 /* technically won't happen as is_multipart_boundary()
931 will fail first. But just in case..
933 if (--mi
->content_top
< mi
->content
) {
934 error("Detected mismatched boundaries, can't recover");
935 mi
->input_error
= -1;
936 mi
->content_top
= mi
->content
;
937 strbuf_release(&newline
);
940 handle_filter(mi
, &newline
);
941 strbuf_release(&newline
);
945 /* skip to the next boundary */
946 if (!find_boundary(mi
, line
))
951 /* set some defaults */
952 mi
->transfer_encoding
= TE_DONTCARE
;
953 strbuf_reset(&mi
->charset
);
955 /* slurp in this section's info */
956 while (read_one_header_line(line
, mi
->input
))
957 check_header(mi
, line
, mi
->p_hdr_data
, 0);
959 strbuf_release(&newline
);
961 if (strbuf_getline_lf(line
, mi
->input
))
963 strbuf_addch(line
, '\n');
967 static void handle_body(struct mailinfo
*mi
, struct strbuf
*line
)
969 struct strbuf prev
= STRBUF_INIT
;
971 /* Skip up to the first boundary */
972 if (*(mi
->content_top
)) {
973 if (!find_boundary(mi
, line
))
974 goto handle_body_out
;
978 /* process any boundary lines */
979 if (*(mi
->content_top
) && is_multipart_boundary(mi
, line
)) {
980 /* flush any leftover */
982 handle_filter(mi
, &prev
);
985 if (!handle_boundary(mi
, line
))
986 goto handle_body_out
;
989 /* Unwrap transfer encoding */
990 decode_transfer_encoding(mi
, line
);
992 switch (mi
->transfer_encoding
) {
996 struct strbuf
**lines
, **it
, *sb
;
998 /* Prepend any previous partial lines */
999 strbuf_insert(line
, 0, prev
.buf
, prev
.len
);
1000 strbuf_reset(&prev
);
1003 * This is a decoded line that may contain
1004 * multiple new lines. Pass only one chunk
1005 * at a time to handle_filter()
1007 lines
= strbuf_split(line
, '\n');
1008 for (it
= lines
; (sb
= *it
); it
++) {
1009 if (*(it
+ 1) == NULL
) /* The last line */
1010 if (sb
->buf
[sb
->len
- 1] != '\n') {
1011 /* Partial line, save it for later. */
1012 strbuf_addbuf(&prev
, sb
);
1015 handle_filter(mi
, sb
);
1018 * The partial chunk is saved in "prev" and will be
1019 * appended by the next iteration of read_line_with_nul().
1021 strbuf_list_free(lines
);
1025 handle_filter(mi
, line
);
1028 if (mi
->input_error
)
1030 } while (!strbuf_getwholeline(line
, mi
->input
, '\n'));
1032 flush_inbody_header_accum(mi
);
1035 strbuf_release(&prev
);
1038 static void output_header_lines(FILE *fout
, const char *hdr
, const struct strbuf
*data
)
1040 const char *sp
= data
->buf
;
1042 char *ep
= strchr(sp
, '\n');
1048 fprintf(fout
, "%s: %.*s\n", hdr
, len
, sp
);
1055 static void handle_info(struct mailinfo
*mi
)
1060 for (i
= 0; header
[i
]; i
++) {
1061 /* only print inbody headers if we output a patch file */
1062 if (mi
->patch_lines
&& mi
->s_hdr_data
[i
])
1063 hdr
= mi
->s_hdr_data
[i
];
1064 else if (mi
->p_hdr_data
[i
])
1065 hdr
= mi
->p_hdr_data
[i
];
1069 if (!strcmp(header
[i
], "Subject")) {
1070 if (!mi
->keep_subject
) {
1071 cleanup_subject(mi
, hdr
);
1074 output_header_lines(mi
->output
, "Subject", hdr
);
1075 } else if (!strcmp(header
[i
], "From")) {
1077 handle_from(mi
, hdr
);
1078 fprintf(mi
->output
, "Author: %s\n", mi
->name
.buf
);
1079 fprintf(mi
->output
, "Email: %s\n", mi
->email
.buf
);
1082 fprintf(mi
->output
, "%s: %s\n", header
[i
], hdr
->buf
);
1085 fprintf(mi
->output
, "\n");
1088 int mailinfo(struct mailinfo
*mi
, const char *msg
, const char *patch
)
1092 struct strbuf line
= STRBUF_INIT
;
1094 cmitmsg
= fopen(msg
, "w");
1099 mi
->patchfile
= fopen(patch
, "w");
1100 if (!mi
->patchfile
) {
1106 mi
->p_hdr_data
= xcalloc(MAX_HDR_PARSED
, sizeof(*(mi
->p_hdr_data
)));
1107 mi
->s_hdr_data
= xcalloc(MAX_HDR_PARSED
, sizeof(*(mi
->s_hdr_data
)));
1110 peek
= fgetc(mi
->input
);
1113 return error("empty patch: '%s'", patch
);
1115 } while (isspace(peek
));
1116 ungetc(peek
, mi
->input
);
1118 /* process the email header */
1119 while (read_one_header_line(&line
, mi
->input
))
1120 check_header(mi
, &line
, mi
->p_hdr_data
, 1);
1122 handle_body(mi
, &line
);
1123 fwrite(mi
->log_message
.buf
, 1, mi
->log_message
.len
, cmitmsg
);
1125 fclose(mi
->patchfile
);
1128 strbuf_release(&line
);
1129 return mi
->input_error
;
1132 static int git_mailinfo_config(const char *var
, const char *value
, void *mi_
)
1134 struct mailinfo
*mi
= mi_
;
1136 if (!starts_with(var
, "mailinfo."))
1137 return git_default_config(var
, value
, NULL
);
1138 if (!strcmp(var
, "mailinfo.scissors")) {
1139 mi
->use_scissors
= git_config_bool(var
, value
);
1142 /* perhaps others here */
1146 void setup_mailinfo(struct mailinfo
*mi
)
1148 memset(mi
, 0, sizeof(*mi
));
1149 strbuf_init(&mi
->name
, 0);
1150 strbuf_init(&mi
->email
, 0);
1151 strbuf_init(&mi
->charset
, 0);
1152 strbuf_init(&mi
->log_message
, 0);
1153 strbuf_init(&mi
->inbody_header_accum
, 0);
1154 mi
->header_stage
= 1;
1155 mi
->use_inbody_headers
= 1;
1156 mi
->content_top
= mi
->content
;
1157 git_config(git_mailinfo_config
, mi
);
1160 void clear_mailinfo(struct mailinfo
*mi
)
1164 strbuf_release(&mi
->name
);
1165 strbuf_release(&mi
->email
);
1166 strbuf_release(&mi
->charset
);
1167 strbuf_release(&mi
->inbody_header_accum
);
1168 free(mi
->message_id
);
1171 for (i
= 0; mi
->p_hdr_data
[i
]; i
++)
1172 strbuf_release(mi
->p_hdr_data
[i
]);
1173 free(mi
->p_hdr_data
);
1175 for (i
= 0; mi
->s_hdr_data
[i
]; i
++)
1176 strbuf_release(mi
->s_hdr_data
[i
]);
1177 free(mi
->s_hdr_data
);
1179 while (mi
->content
< mi
->content_top
) {
1180 free(*(mi
->content_top
));
1184 strbuf_release(&mi
->log_message
);