projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-clone: exit early if repo isn't specified
[git.git]
/
mailinfo.c
diff --git
a/mailinfo.c
b/mailinfo.c
index
9f95f37
..
3c56f8c
100644
(file)
--- a/
mailinfo.c
+++ b/
mailinfo.c
@@
-7,7
+7,9
@@
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
+#ifndef NO_ICONV
#include <iconv.h>
#include <iconv.h>
+#endif
#include "git-compat-util.h"
#include "cache.h"
#include "git-compat-util.h"
#include "cache.h"
@@
-469,10
+471,11
@@
static int decode_b_segment(char *in, char *ot, char *ep)
static void convert_to_utf8(char *line, char *charset)
{
static void convert_to_utf8(char *line, char *charset)
{
+#ifndef NO_ICONV
char *in, *out;
size_t insize, outsize, nrc;
char outbuf[4096]; /* cheat */
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);
char *input_charset = *charset ? charset : latin_one;
iconv_t conv = iconv_open(metainfo_charset, input_charset);
@@
-501,6
+504,7
@@
static void convert_to_utf8(char *line, char *charset)
return;
*out = 0;
strcpy(line, outbuf);
return;
*out = 0;
strcpy(line, outbuf);
+#endif
}
static void decode_header_bq(char *it)
}
static void decode_header_bq(char *it)
@@
-707,6
+711,9
@@
static void handle_multipart_body(void)
if (!len) {
if (handle_multipart_one_part() < 0)
return;
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);
}
else
check_subheader_line(line, len);