X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=mailinfo.c;h=b27651935db85cf0ab651d523c502943d137b7cd;hb=f8ba655ee4131e5c73c28a4ea854b24ce4058e1e;hp=9f95f37651e2ce5a3930051fe875f1c16ede97c2;hpb=1ed91937e5cd59fdbdfa5f15f6fac132d2b21ce0;p=git.git

diff --git a/mailinfo.c b/mailinfo.c
index 9f95f376..b2765193 100644
--- a/mailinfo.c
+++ b/mailinfo.c
@@ -7,7 +7,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
+#ifndef NO_ICONV
 #include <iconv.h>
+#endif
 #include "git-compat-util.h"
 #include "cache.h"
 
@@ -403,7 +405,7 @@ static unsigned hexval(int c)
 	return ~0;
 }
 
-static int decode_q_segment(char *in, char *ot, char *ep)
+static int decode_q_segment(char *in, char *ot, char *ep, int rfc2047)
 {
 	int c;
 	while ((c = *in++) != 0 && (in <= ep)) {
@@ -412,9 +414,11 @@ static int decode_q_segment(char *in, char *ot, char *ep)
 			if (d == '\n' || !d)
 				break; /* drop trailing newline */
 			*ot++ = ((hexval(d) << 4) | hexval(*in++));
+			continue;
 		}
-		else
-			*ot++ = c;
+		if (rfc2047 && c == '_') /* rfc2047 4.2 (2) */
+			c = 0x20;
+		*ot++ = c;
 	}
 	*ot = 0;
 	return 0;
@@ -469,10 +473,11 @@ static int decode_b_segment(char *in, char *ot, char *ep)
 
 static void convert_to_utf8(char *line, char *charset)
 {
+#ifndef NO_ICONV
 	char *in, *out;
 	size_t insize, outsize, nrc;
 	char outbuf[4096]; /* cheat */
-	static char latin_one[] = "latin-1";
+	static char latin_one[] = "latin1";
 	char *input_charset = *charset ? charset : latin_one;
 	iconv_t conv = iconv_open(metainfo_charset, input_charset);
 
@@ -501,6 +506,7 @@ static void convert_to_utf8(char *line, char *charset)
 		return;
 	*out = 0;
 	strcpy(line, outbuf);
+#endif
 }
 
 static void decode_header_bq(char *it)
@@ -543,7 +549,7 @@ static void decode_header_bq(char *it)
 			sz = decode_b_segment(cp + 3, piecebuf, ep);
 			break;
 		case 'q':
-			sz = decode_q_segment(cp + 3, piecebuf, ep);
+			sz = decode_q_segment(cp + 3, piecebuf, ep, 1);
 			break;
 		}
 		if (sz < 0)
@@ -565,7 +571,7 @@ static void decode_transfer_encoding(char *line)
 	switch (transfer_encoding) {
 	case TE_QP:
 		ep = line + strlen(line);
-		decode_q_segment(line, line, ep);
+		decode_q_segment(line, line, ep, 0);
 		break;
 	case TE_BASE64:
 		ep = line + strlen(line);
@@ -707,6 +713,9 @@ static void handle_multipart_body(void)
 		if (!len) {
 			if (handle_multipart_one_part() < 0)
 				return;
+			/* Reset per part headers */
+			transfer_encoding = TE_DONTCARE;
+			charset[0] = 0;
 		}
 		else
 			check_subheader_line(line, len);