6 static void cleanup_space(struct strbuf
*sb
)
9 for (pos
= 0; pos
< sb
->len
; pos
++) {
10 if (isspace(sb
->buf
[pos
])) {
12 for (cnt
= 0; isspace(sb
->buf
[pos
+ cnt
+ 1]); cnt
++);
13 strbuf_remove(sb
, pos
+ 1, cnt
);
18 static void get_sane_name(struct strbuf
*out
, struct strbuf
*name
, struct strbuf
*email
)
20 struct strbuf
*src
= name
;
21 if (name
->len
< 3 || 60 < name
->len
|| strchr(name
->buf
, '@') ||
22 strchr(name
->buf
, '<') || strchr(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_litterally
= 0;
62 strbuf_addch(outbuf
, '(');
64 while ((c
= *in
++) != 0) {
65 if (take_next_litterally
== 1) {
66 take_next_litterally
= 0;
70 take_next_litterally
= 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_litterally
= 0;
92 while ((c
= *in
++) != 0) {
93 if (take_next_litterally
== 1) {
94 take_next_litterally
= 0;
98 take_next_litterally
= 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, '@')) {
162 /* Pick up the string around '@', possibly delimited with <>
163 * pair; that is the email part.
175 el
= strcspn(at
, " \n\t\r\v\f>");
176 strbuf_reset(&mi
->email
);
177 strbuf_add(&mi
->email
, at
, el
);
178 strbuf_remove(&f
, at
- f
.buf
, el
+ (at
[el
] ? 1 : 0));
180 /* The remainder is name. It could be
182 * - "John Doe <john.doe@xz>" (a), or
183 * - "john.doe@xz (John Doe)" (b), or
184 * - "John (zzz) Doe <john.doe@xz> (Comment)" (c)
186 * but we have removed the email part, so
188 * - remove extra spaces which could stay after email (case 'c'), and
189 * - trim from both ends, possibly removing the () pair at the end
190 * (cases 'a' and 'b').
194 if (f
.buf
[0] == '(' && f
.len
&& f
.buf
[f
.len
- 1] == ')') {
195 strbuf_remove(&f
, 0, 1);
196 strbuf_setlen(&f
, f
.len
- 1);
199 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 */
373 strbuf_addch(out
, (hexval(d
) << 4) | hexval(*in
++));
376 if (rfc2047
&& c
== '_') /* rfc2047 4.2 (2) */
378 strbuf_addch(out
, c
);
383 static struct strbuf
*decode_b_segment(const struct strbuf
*b_seg
)
385 /* Decode in..ep, possibly in-place to ot */
386 int c
, pos
= 0, acc
= 0;
387 const char *in
= b_seg
->buf
;
388 struct strbuf
*out
= xmalloc(sizeof(struct strbuf
));
389 strbuf_init(out
, b_seg
->len
);
391 while ((c
= *in
++) != 0) {
396 else if ('A' <= c
&& c
<= 'Z')
398 else if ('a' <= c
&& c
<= 'z')
400 else if ('0' <= c
&& c
<= '9')
403 continue; /* garbage */
409 strbuf_addch(out
, (acc
| (c
>> 4)));
413 strbuf_addch(out
, (acc
| (c
>> 2)));
417 strbuf_addch(out
, (acc
| c
));
425 static int convert_to_utf8(struct mailinfo
*mi
,
426 struct strbuf
*line
, const char *charset
)
430 if (!mi
->metainfo_charset
|| !charset
|| !*charset
)
433 if (same_encoding(mi
->metainfo_charset
, charset
))
435 out
= reencode_string(line
->buf
, mi
->metainfo_charset
, charset
);
437 mi
->input_error
= -1;
438 return error("cannot convert from %s to %s",
439 charset
, mi
->metainfo_charset
);
441 strbuf_attach(line
, out
, strlen(out
), strlen(out
));
445 static void decode_header(struct mailinfo
*mi
, struct strbuf
*it
)
448 struct strbuf outbuf
= STRBUF_INIT
, *dec
;
449 struct strbuf charset_q
= STRBUF_INIT
, piecebuf
= STRBUF_INIT
;
450 int found_error
= 1; /* pessimism */
453 while (in
- it
->buf
<= it
->len
&& (ep
= strstr(in
, "=?")) != NULL
) {
455 strbuf_reset(&charset_q
);
456 strbuf_reset(&piecebuf
);
460 * We are about to process an encoded-word
461 * that begins at ep, but there is something
462 * before the encoded word.
465 for (scan
= in
; scan
< ep
; scan
++)
469 if (scan
!= ep
|| in
== it
->buf
) {
471 * We should not lose that "something",
472 * unless we have just processed an
473 * encoded-word, and there is only LWS
474 * before the one we are about to process.
476 strbuf_add(&outbuf
, in
, ep
- in
);
480 * ep : "=?iso-2022-jp?B?GyR...?= foo"
481 * ep : "=?ISO-8859-1?Q?Foo=FCbar?= baz"
485 if (ep
- it
->buf
>= it
->len
|| !(cp
= strchr(ep
, '?')))
488 if (cp
+ 3 - it
->buf
> it
->len
)
490 strbuf_add(&charset_q
, ep
, cp
- ep
);
493 if (!encoding
|| cp
[2] != '?')
495 ep
= strstr(cp
+ 3, "?=");
498 strbuf_add(&piecebuf
, cp
+ 3, ep
- cp
- 3);
499 switch (tolower(encoding
)) {
503 dec
= decode_b_segment(&piecebuf
);
506 dec
= decode_q_segment(&piecebuf
, 1);
509 if (convert_to_utf8(mi
, dec
, charset_q
.buf
))
512 strbuf_addbuf(&outbuf
, dec
);
517 strbuf_addstr(&outbuf
, in
);
519 strbuf_addbuf(it
, &outbuf
);
522 strbuf_release(&outbuf
);
523 strbuf_release(&charset_q
);
524 strbuf_release(&piecebuf
);
527 mi
->input_error
= -1;
530 static int check_header(struct mailinfo
*mi
,
531 const struct strbuf
*line
,
532 struct strbuf
*hdr_data
[], int overwrite
)
535 struct strbuf sb
= STRBUF_INIT
;
537 /* search for the interesting parts */
538 for (i
= 0; header
[i
]; i
++) {
539 int len
= strlen(header
[i
]);
540 if ((!hdr_data
[i
] || overwrite
) && cmp_header(line
, header
[i
])) {
541 /* Unwrap inline B and Q encoding, and optionally
542 * normalize the meta information to utf8.
544 strbuf_add(&sb
, line
->buf
+ len
+ 2, line
->len
- len
- 2);
545 decode_header(mi
, &sb
);
546 handle_header(&hdr_data
[i
], &sb
);
548 goto check_header_out
;
553 if (cmp_header(line
, "Content-Type")) {
554 len
= strlen("Content-Type: ");
555 strbuf_add(&sb
, line
->buf
+ len
, line
->len
- len
);
556 decode_header(mi
, &sb
);
557 strbuf_insert(&sb
, 0, "Content-Type: ", len
);
558 handle_content_type(mi
, &sb
);
560 goto check_header_out
;
562 if (cmp_header(line
, "Content-Transfer-Encoding")) {
563 len
= strlen("Content-Transfer-Encoding: ");
564 strbuf_add(&sb
, line
->buf
+ len
, line
->len
- len
);
565 decode_header(mi
, &sb
);
566 handle_content_transfer_encoding(mi
, &sb
);
568 goto check_header_out
;
570 if (cmp_header(line
, "Message-Id")) {
571 len
= strlen("Message-Id: ");
572 strbuf_add(&sb
, line
->buf
+ len
, line
->len
- len
);
573 decode_header(mi
, &sb
);
574 if (mi
->add_message_id
)
575 mi
->message_id
= strbuf_detach(&sb
, NULL
);
577 goto check_header_out
;
586 * Returns 1 if the given line or any line beginning with the given line is an
587 * in-body header (that is, check_header will succeed when passed
590 static int is_inbody_header(const struct mailinfo
*mi
,
591 const struct strbuf
*line
)
594 for (i
= 0; header
[i
]; i
++)
595 if (!mi
->s_hdr_data
[i
] && cmp_header(line
, header
[i
]))
600 static void decode_transfer_encoding(struct mailinfo
*mi
, struct strbuf
*line
)
604 switch (mi
->transfer_encoding
) {
606 ret
= decode_q_segment(line
, 0);
609 ret
= decode_b_segment(line
);
616 strbuf_addbuf(line
, ret
);
621 static inline int patchbreak(const struct strbuf
*line
)
625 /* Beginning of a "diff -" header? */
626 if (starts_with(line
->buf
, "diff -"))
629 /* CVS "Index: " line? */
630 if (starts_with(line
->buf
, "Index: "))
634 * "--- <filename>" starts patches without headers
635 * "---<sp>*" is a manual separator
640 if (starts_with(line
->buf
, "---")) {
641 /* space followed by a filename? */
642 if (line
->buf
[3] == ' ' && !isspace(line
->buf
[4]))
644 /* Just whitespace? */
645 for (i
= 3; i
< line
->len
; i
++) {
646 unsigned char c
= line
->buf
[i
];
657 static int is_scissors_line(const char *line
)
660 int scissors
= 0, gap
= 0;
661 const char *first_nonblank
= NULL
, *last_nonblank
= NULL
;
662 int visible
, perforation
= 0, in_perforation
= 0;
664 for (c
= line
; *c
; c
++) {
666 if (in_perforation
) {
673 if (first_nonblank
== NULL
)
680 if ((!memcmp(c
, ">8", 2) || !memcmp(c
, "8<", 2) ||
681 !memcmp(c
, ">%", 2) || !memcmp(c
, "%<", 2))) {
692 * The mark must be at least 8 bytes long (e.g. "-- >8 --").
693 * Even though there can be arbitrary cruft on the same line
694 * (e.g. "cut here"), in order to avoid misidentification, the
695 * perforation must occupy more than a third of the visible
696 * width of the line, and dashes and scissors must occupy more
697 * than half of the perforation.
700 if (first_nonblank
&& last_nonblank
)
701 visible
= last_nonblank
- first_nonblank
+ 1;
704 return (scissors
&& 8 <= visible
&&
705 visible
< perforation
* 3 &&
706 gap
* 2 < perforation
);
709 static void flush_inbody_header_accum(struct mailinfo
*mi
)
711 if (!mi
->inbody_header_accum
.len
)
713 if (!check_header(mi
, &mi
->inbody_header_accum
, mi
->s_hdr_data
, 0))
714 die("BUG: inbody_header_accum, if not empty, must always contain a valid in-body header");
715 strbuf_reset(&mi
->inbody_header_accum
);
718 static int check_inbody_header(struct mailinfo
*mi
, const struct strbuf
*line
)
720 if (mi
->inbody_header_accum
.len
&&
721 (line
->buf
[0] == ' ' || line
->buf
[0] == '\t')) {
722 if (mi
->use_scissors
&& is_scissors_line(line
->buf
)) {
724 * This is a scissors line; do not consider this line
725 * as a header continuation line.
727 flush_inbody_header_accum(mi
);
730 strbuf_strip_suffix(&mi
->inbody_header_accum
, "\n");
731 strbuf_addbuf(&mi
->inbody_header_accum
, line
);
735 flush_inbody_header_accum(mi
);
737 if (starts_with(line
->buf
, ">From") && isspace(line
->buf
[5]))
738 return is_format_patch_separator(line
->buf
+ 1, line
->len
- 1);
739 if (starts_with(line
->buf
, "[PATCH]") && isspace(line
->buf
[7])) {
741 for (i
= 0; header
[i
]; i
++)
742 if (!strcmp("Subject", header
[i
])) {
743 handle_header(&mi
->s_hdr_data
[i
], line
);
748 if (is_inbody_header(mi
, line
)) {
749 strbuf_addbuf(&mi
->inbody_header_accum
, line
);
755 static int handle_commit_msg(struct mailinfo
*mi
, struct strbuf
*line
)
757 assert(!mi
->filter_stage
);
759 if (mi
->header_stage
) {
760 if (!line
->len
|| (line
->len
== 1 && line
->buf
[0] == '\n'))
764 if (mi
->use_inbody_headers
&& mi
->header_stage
) {
765 mi
->header_stage
= check_inbody_header(mi
, line
);
766 if (mi
->header_stage
)
769 /* Only trim the first (blank) line of the commit message
770 * when ignoring in-body headers.
772 mi
->header_stage
= 0;
774 /* normalize the log message to UTF-8. */
775 if (convert_to_utf8(mi
, line
, mi
->charset
.buf
))
776 return 0; /* mi->input_error already set */
778 if (mi
->use_scissors
&& is_scissors_line(line
->buf
)) {
781 strbuf_setlen(&mi
->log_message
, 0);
782 mi
->header_stage
= 1;
785 * We may have already read "secondary headers"; purge
786 * them to give ourselves a clean restart.
788 for (i
= 0; header
[i
]; i
++) {
789 if (mi
->s_hdr_data
[i
])
790 strbuf_release(mi
->s_hdr_data
[i
]);
791 mi
->s_hdr_data
[i
] = NULL
;
796 if (patchbreak(line
)) {
798 strbuf_addf(&mi
->log_message
,
799 "Message-Id: %s\n", mi
->message_id
);
803 strbuf_addbuf(&mi
->log_message
, line
);
807 static void handle_patch(struct mailinfo
*mi
, const struct strbuf
*line
)
809 fwrite(line
->buf
, 1, line
->len
, mi
->patchfile
);
813 static void handle_filter(struct mailinfo
*mi
, struct strbuf
*line
)
815 switch (mi
->filter_stage
) {
817 if (!handle_commit_msg(mi
, line
))
821 handle_patch(mi
, line
);
826 static int is_rfc2822_header(const struct strbuf
*line
)
829 * The section that defines the loosest possible
830 * field name is "3.6.8 Optional fields".
832 * optional-field = field-name ":" unstructured CRLF
833 * field-name = 1*ftext
834 * ftext = %d33-57 / %59-126
837 char *cp
= line
->buf
;
839 /* Count mbox From headers as headers */
840 if (starts_with(cp
, "From ") || starts_with(cp
, ">From "))
843 while ((ch
= *cp
++)) {
846 if ((33 <= ch
&& ch
<= 57) ||
847 (59 <= ch
&& ch
<= 126))
854 static int read_one_header_line(struct strbuf
*line
, FILE *in
)
856 struct strbuf continuation
= STRBUF_INIT
;
858 /* Get the first part of the line. */
859 if (strbuf_getline_lf(line
, in
))
863 * Is it an empty line or not a valid rfc2822 header?
864 * If so, stop here, and return false ("not a header")
867 if (!line
->len
|| !is_rfc2822_header(line
)) {
868 /* Re-add the newline */
869 strbuf_addch(line
, '\n');
874 * Now we need to eat all the continuation lines..
875 * Yuck, 2822 header "folding"
880 peek
= fgetc(in
); ungetc(peek
, in
);
881 if (peek
!= ' ' && peek
!= '\t')
883 if (strbuf_getline_lf(&continuation
, in
))
885 continuation
.buf
[0] = ' ';
886 strbuf_rtrim(&continuation
);
887 strbuf_addbuf(line
, &continuation
);
889 strbuf_release(&continuation
);
894 static int find_boundary(struct mailinfo
*mi
, struct strbuf
*line
)
896 while (!strbuf_getline_lf(line
, mi
->input
)) {
897 if (*(mi
->content_top
) && is_multipart_boundary(mi
, line
))
903 static int handle_boundary(struct mailinfo
*mi
, struct strbuf
*line
)
905 struct strbuf newline
= STRBUF_INIT
;
907 strbuf_addch(&newline
, '\n');
909 if (line
->len
>= (*(mi
->content_top
))->len
+ 2 &&
910 !memcmp(line
->buf
+ (*(mi
->content_top
))->len
, "--", 2)) {
911 /* we hit an end boundary */
912 /* pop the current boundary off the stack */
913 strbuf_release(*(mi
->content_top
));
914 free(*(mi
->content_top
));
915 *(mi
->content_top
) = NULL
;
917 /* technically won't happen as is_multipart_boundary()
918 will fail first. But just in case..
920 if (--mi
->content_top
< mi
->content
) {
921 error("Detected mismatched boundaries, can't recover");
922 mi
->input_error
= -1;
923 mi
->content_top
= mi
->content
;
926 handle_filter(mi
, &newline
);
927 strbuf_release(&newline
);
931 /* skip to the next boundary */
932 if (!find_boundary(mi
, line
))
937 /* set some defaults */
938 mi
->transfer_encoding
= TE_DONTCARE
;
939 strbuf_reset(&mi
->charset
);
941 /* slurp in this section's info */
942 while (read_one_header_line(line
, mi
->input
))
943 check_header(mi
, line
, mi
->p_hdr_data
, 0);
945 strbuf_release(&newline
);
947 if (strbuf_getline_lf(line
, mi
->input
))
949 strbuf_addch(line
, '\n');
953 static void handle_body(struct mailinfo
*mi
, struct strbuf
*line
)
955 struct strbuf prev
= STRBUF_INIT
;
957 /* Skip up to the first boundary */
958 if (*(mi
->content_top
)) {
959 if (!find_boundary(mi
, line
))
960 goto handle_body_out
;
964 /* process any boundary lines */
965 if (*(mi
->content_top
) && is_multipart_boundary(mi
, line
)) {
966 /* flush any leftover */
968 handle_filter(mi
, &prev
);
971 if (!handle_boundary(mi
, line
))
972 goto handle_body_out
;
975 /* Unwrap transfer encoding */
976 decode_transfer_encoding(mi
, line
);
978 switch (mi
->transfer_encoding
) {
982 struct strbuf
**lines
, **it
, *sb
;
984 /* Prepend any previous partial lines */
985 strbuf_insert(line
, 0, prev
.buf
, prev
.len
);
989 * This is a decoded line that may contain
990 * multiple new lines. Pass only one chunk
991 * at a time to handle_filter()
993 lines
= strbuf_split(line
, '\n');
994 for (it
= lines
; (sb
= *it
); it
++) {
995 if (*(it
+ 1) == NULL
) /* The last line */
996 if (sb
->buf
[sb
->len
- 1] != '\n') {
997 /* Partial line, save it for later. */
998 strbuf_addbuf(&prev
, sb
);
1001 handle_filter(mi
, sb
);
1004 * The partial chunk is saved in "prev" and will be
1005 * appended by the next iteration of read_line_with_nul().
1007 strbuf_list_free(lines
);
1011 handle_filter(mi
, line
);
1014 if (mi
->input_error
)
1016 } while (!strbuf_getwholeline(line
, mi
->input
, '\n'));
1018 flush_inbody_header_accum(mi
);
1021 strbuf_release(&prev
);
1024 static void output_header_lines(FILE *fout
, const char *hdr
, const struct strbuf
*data
)
1026 const char *sp
= data
->buf
;
1028 char *ep
= strchr(sp
, '\n');
1034 fprintf(fout
, "%s: %.*s\n", hdr
, len
, sp
);
1041 static void handle_info(struct mailinfo
*mi
)
1046 for (i
= 0; header
[i
]; i
++) {
1047 /* only print inbody headers if we output a patch file */
1048 if (mi
->patch_lines
&& mi
->s_hdr_data
[i
])
1049 hdr
= mi
->s_hdr_data
[i
];
1050 else if (mi
->p_hdr_data
[i
])
1051 hdr
= mi
->p_hdr_data
[i
];
1055 if (!strcmp(header
[i
], "Subject")) {
1056 if (!mi
->keep_subject
) {
1057 cleanup_subject(mi
, hdr
);
1060 output_header_lines(mi
->output
, "Subject", hdr
);
1061 } else if (!strcmp(header
[i
], "From")) {
1063 handle_from(mi
, hdr
);
1064 fprintf(mi
->output
, "Author: %s\n", mi
->name
.buf
);
1065 fprintf(mi
->output
, "Email: %s\n", mi
->email
.buf
);
1068 fprintf(mi
->output
, "%s: %s\n", header
[i
], hdr
->buf
);
1071 fprintf(mi
->output
, "\n");
1074 int mailinfo(struct mailinfo
*mi
, const char *msg
, const char *patch
)
1078 struct strbuf line
= STRBUF_INIT
;
1080 cmitmsg
= fopen(msg
, "w");
1085 mi
->patchfile
= fopen(patch
, "w");
1086 if (!mi
->patchfile
) {
1092 mi
->p_hdr_data
= xcalloc(MAX_HDR_PARSED
, sizeof(*(mi
->p_hdr_data
)));
1093 mi
->s_hdr_data
= xcalloc(MAX_HDR_PARSED
, sizeof(*(mi
->s_hdr_data
)));
1096 peek
= fgetc(mi
->input
);
1097 } while (isspace(peek
));
1098 ungetc(peek
, mi
->input
);
1100 /* process the email header */
1101 while (read_one_header_line(&line
, mi
->input
))
1102 check_header(mi
, &line
, mi
->p_hdr_data
, 1);
1104 handle_body(mi
, &line
);
1105 fwrite(mi
->log_message
.buf
, 1, mi
->log_message
.len
, cmitmsg
);
1107 fclose(mi
->patchfile
);
1110 strbuf_release(&line
);
1111 return mi
->input_error
;
1114 static int git_mailinfo_config(const char *var
, const char *value
, void *mi_
)
1116 struct mailinfo
*mi
= mi_
;
1118 if (!starts_with(var
, "mailinfo."))
1119 return git_default_config(var
, value
, NULL
);
1120 if (!strcmp(var
, "mailinfo.scissors")) {
1121 mi
->use_scissors
= git_config_bool(var
, value
);
1124 /* perhaps others here */
1128 void setup_mailinfo(struct mailinfo
*mi
)
1130 memset(mi
, 0, sizeof(*mi
));
1131 strbuf_init(&mi
->name
, 0);
1132 strbuf_init(&mi
->email
, 0);
1133 strbuf_init(&mi
->charset
, 0);
1134 strbuf_init(&mi
->log_message
, 0);
1135 strbuf_init(&mi
->inbody_header_accum
, 0);
1136 mi
->header_stage
= 1;
1137 mi
->use_inbody_headers
= 1;
1138 mi
->content_top
= mi
->content
;
1139 git_config(git_mailinfo_config
, mi
);
1142 void clear_mailinfo(struct mailinfo
*mi
)
1146 strbuf_release(&mi
->name
);
1147 strbuf_release(&mi
->email
);
1148 strbuf_release(&mi
->charset
);
1149 strbuf_release(&mi
->inbody_header_accum
);
1150 free(mi
->message_id
);
1152 for (i
= 0; mi
->p_hdr_data
[i
]; i
++)
1153 strbuf_release(mi
->p_hdr_data
[i
]);
1154 free(mi
->p_hdr_data
);
1155 for (i
= 0; mi
->s_hdr_data
[i
]; i
++)
1156 strbuf_release(mi
->s_hdr_data
[i
]);
1157 free(mi
->s_hdr_data
);
1159 while (mi
->content
< mi
->content_top
) {
1160 free(*(mi
->content_top
));
1164 strbuf_release(&mi
->log_message
);