Use log output encoding in --pretty=email headers.
Private functions add_rfc2047() and pretty_print_commit() assumed they are only emitting UTF-8. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Jan 12, 2007 at 17:32 UTC
f7e68b2967182f14547125d1369f37ad4d83187e
1 file changed
+55
-27
commit.c
+55
-27
@@ -464,20 +464,29 @@ static int get_one_line(const char *msg, unsigned long len)
464
return ret;
465
}
466
467
+/* High bit set, or ISO-2022-INT */
468
+static int non_ascii(int ch)
469
+{
470
+ ch = (ch & 0xff);
471
+ return ((ch & 0x80) || (ch == 0x1b));
472
+}
473
+
474
static int is_rfc2047_special(char ch)
475
{
469
- return ((ch & 0x80) || (ch == '=') || (ch == '?') || (ch == '_'));
476
+ return (non_ascii(ch) || (ch == '=') || (ch == '?') || (ch == '_'));
477
}
478
472
-static int add_rfc2047(char *buf, const char *line, int len)
479
+static int add_rfc2047(char *buf, const char *line, int len,
480
+ const char *encoding)
481
{
482
char *bp = buf;
483
int i, needquote;
476
- static const char q_utf8[] = "=?utf-8?q?";
484
+ char q_encoding[128];
485
+ const char *q_encoding_fmt = "=?%s?q?";
486
487
for (i = needquote = 0; !needquote && i < len; i++) {
479
- unsigned ch = line[i];
480
- if (ch & 0x80)
488
+ int ch = line[i];
489
+ if (non_ascii(ch))
490
needquote++;
491
if ((i + 1 < len) &&
492
(ch == '=' && line[i+1] == '?'))
@@ -486,8 +495,11 @@ static int add_rfc2047(char *buf, const char *line, int len)
495
if (!needquote)
496
return sprintf(buf, "%.*s", len, line);
497
489
- memcpy(bp, q_utf8, sizeof(q_utf8)-1);
490
- bp += sizeof(q_utf8)-1;
498
+ i = snprintf(q_encoding, sizeof(q_encoding), q_encoding_fmt, encoding);
499
+ if (sizeof(q_encoding) < i)
500
+ die("Insanely long encoding name %s", encoding);
501
+ memcpy(bp, q_encoding, i);
502
+ bp += i;
503
for (i = 0; i < len; i++) {
504
unsigned ch = line[i] & 0xFF;
505
if (is_rfc2047_special(ch)) {
@@ -505,7 +517,8 @@ static int add_rfc2047(char *buf, const char *line, int len)
517
}
518
519
static int add_user_info(const char *what, enum cmit_fmt fmt, char *buf,
508
- const char *line, int relative_date)
520
+ const char *line, int relative_date,
521
+ const char *encoding)
522
{
523
char *date;
524
int namelen;
@@ -533,7 +546,8 @@ static int add_user_info(const char *what, enum cmit_fmt fmt, char *buf,
546
filler = "";
547
strcpy(buf, "From: ");
548
ret = strlen(buf);
536
- ret += add_rfc2047(buf + ret, line, display_name_length);
549
+ ret += add_rfc2047(buf + ret, line, display_name_length,
550
+ encoding);
551
memcpy(buf + ret, name_tail, namelen - display_name_length);
552
ret += namelen - display_name_length;
553
buf[ret++] = '\n';
@@ -668,21 +682,18 @@ static char *replace_encoding_header(char *buf, char *encoding)
682
return buf;
683
}
684
671
-static char *logmsg_reencode(const struct commit *commit)
685
+static char *logmsg_reencode(const struct commit *commit,
686
+ char *output_encoding)
687
{
688
char *encoding;
689
char *out;
675
- char *output_encoding = (git_log_output_encoding
676
- ? git_log_output_encoding
677
- : git_commit_encoding);
690
+ char *utf8 = "utf-8";
691
679
- if (!output_encoding)
680
- output_encoding = "utf-8";
681
- else if (!*output_encoding)
692
+ if (!*output_encoding)
693
return NULL;
694
encoding = get_header(commit, "encoding");
695
if (!encoding)
685
- return NULL;
696
+ encoding = utf8;
697
if (!strcmp(encoding, output_encoding))
698
out = strdup(commit->buffer);
699
else
@@ -691,7 +702,8 @@ static char *logmsg_reencode(const struct commit *commit)
702
if (out)
703
out = replace_encoding_header(out, output_encoding);
704
694
- free(encoding);
705
+ if (encoding != utf8)
706
+ free(encoding);
707
if (!out)
708
return NULL;
709
return out;
@@ -711,8 +723,15 @@ unsigned long pretty_print_commit(enum cmit_fmt fmt,
723
int parents_shown = 0;
724
const char *msg = commit->buffer;
725
int plain_non_ascii = 0;
714
- char *reencoded = logmsg_reencode(commit);
726
+ char *reencoded;
727
+ char *encoding;
728
729
+ encoding = (git_log_output_encoding
730
+ ? git_log_output_encoding
731
+ : git_commit_encoding);
732
+ if (!encoding)
733
+ encoding = "utf-8";
734
+ reencoded = logmsg_reencode(commit, encoding);
735
if (reencoded)
736
msg = reencoded;
737
@@ -738,7 +757,7 @@ unsigned long pretty_print_commit(enum cmit_fmt fmt,
757
i + 1 < len && msg[i+1] == '\n')
758
in_body = 1;
759
}
741
- else if (ch & 0x80) {
760
+ else if (non_ascii(ch)) {
761
plain_non_ascii = 1;
762
break;
763
}
@@ -797,13 +816,15 @@ unsigned long pretty_print_commit(enum cmit_fmt fmt,
816
offset += add_user_info("Author", fmt,
817
buf + offset,
818
line + 7,
800
- relative_date);
819
+ relative_date,
820
+ encoding);
821
if (!memcmp(line, "committer ", 10) &&
822
(fmt == CMIT_FMT_FULL || fmt == CMIT_FMT_FULLER))
823
offset += add_user_info("Commit", fmt,
824
buf + offset,
825
line + 10,
806
- relative_date);
826
+ relative_date,
827
+ encoding);
828
continue;
829
}
830
@@ -826,7 +847,8 @@ unsigned long pretty_print_commit(enum cmit_fmt fmt,
847
int slen = strlen(subject);
848
memcpy(buf + offset, subject, slen);
849
offset += slen;
829
- offset += add_rfc2047(buf + offset, line, linelen);
850
+ offset += add_rfc2047(buf + offset, line, linelen,
851
+ encoding);
852
}
853
else {
854
memset(buf + offset, ' ', indent);
@@ -837,11 +859,17 @@ unsigned long pretty_print_commit(enum cmit_fmt fmt,
859
if (fmt == CMIT_FMT_ONELINE)
860
break;
861
if (subject && plain_non_ascii) {
840
- static const char header[] =
841
- "Content-Type: text/plain; charset=UTF-8\n"
862
+ int sz;
863
+ char header[512];
864
+ const char *header_fmt =
865
+ "Content-Type: text/plain; charset=%s\n"
866
"Content-Transfer-Encoding: 8bit\n";
843
- memcpy(buf + offset, header, sizeof(header)-1);
844
- offset += sizeof(header)-1;
867
+ sz = snprintf(header, sizeof(header), header_fmt,
868
+ encoding);
869
+ if (sizeof(header) < sz)
870
+ die("Encoding name %s too long", encoding);
871
+ memcpy(buf + offset, header, sz);
872
+ offset += sz;
873
}
874
if (after_subject) {
875
int slen = strlen(after_subject);