utf8.c: add reencode_string_len() that can handle NULs in string

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/compat/precompose_utf8.c b/compat/precompose_utf8.c
index 030174db515e764aa883b21afe9be8fb3ae41f2e..7980abd1a71d0676f35eb300c46a30a7298e82f3 100644 (file)
--- a/compat/precompose_utf8.c
+++ b/compat/precompose_utf8.c
@@ -78,7 +78,7 @@ void precompose_argv(int argc, const char **argv)
                size_t namelen;
                oldarg = argv[i];
                if (has_non_ascii(oldarg, (size_t)-1, &namelen)) {
                size_t namelen;
                oldarg = argv[i];
                if (has_non_ascii(oldarg, (size_t)-1, &namelen)) {

-                       newarg = reencode_string_iconv(oldarg, namelen, ic_precompose);
+                       newarg = reencode_string_iconv(oldarg, namelen, ic_precompose, NULL);

                        if (newarg)
                                argv[i] = newarg;
                }
                        if (newarg)
                                argv[i] = newarg;
                }

diff --git a/utf8.c b/utf8.c
index e7ba33c2355d1f4a3ab7b679a3e98dec25e0707d..7c342ff4b6eb2e8c94bb3fa5c86b77b5de9abfae 100644 (file)
--- a/utf8.c
+++ b/utf8.c
@@ -468,7 +468,7 @@ int utf8_fprintf(FILE *stream, const char *format, ...)
 #else
        typedef char * iconv_ibp;
 #endif
 #else
        typedef char * iconv_ibp;
 #endif

-char *reencode_string_iconv(const char *in, size_t insz, iconv_t conv)
+char *reencode_string_iconv(const char *in, size_t insz, iconv_t conv, int *outsz_p)

 {
        size_t outsz, outalloc;
        char *out, *outpos;
 {
        size_t outsz, outalloc;
        char *out, *outpos;


@@ -502,13 +502,17 @@ char *reencode_string_iconv(const char *in, size_t insz, iconv_t conv)
                }
                else {
                        *outpos = '\0';
                }
                else {
                        *outpos = '\0';

+                       if (outsz_p)
+                               *outsz_p = outpos - out;

                        break;
                }
        }
        return out;
 }
 
                        break;
                }
        }
        return out;
 }
 

-char *reencode_string(const char *in, const char *out_encoding, const char *in_encoding)
+char *reencode_string_len(const char *in, int insz,
+                         const char *out_encoding, const char *in_encoding,
+                         int *outsz)

 {
        iconv_t conv;
        char *out;
 {
        iconv_t conv;
        char *out;


@@ -534,7 +538,7 @@ char *reencode_string(const char *in, const char *out_encoding, const char *in_e
                        return NULL;
        }
 
                        return NULL;
        }
 

-       out = reencode_string_iconv(in, strlen(in), conv);
+       out = reencode_string_iconv(in, insz, conv, outsz);

        iconv_close(conv);
        return out;
 }
        iconv_close(conv);
        return out;
 }

diff --git a/utf8.h b/utf8.h
index d3da96f23443df001fd47413882bad62a05b6b2a..a43ef9ae74e1aa9199c9abe0c033d180f4aededf 100644 (file)
--- a/utf8.h
+++ b/utf8.h
@@ -17,12 +17,25 @@ void strbuf_add_wrapped_bytes(struct strbuf *buf, const char *data, int len,
                             int indent, int indent2, int width);
 
 #ifndef NO_ICONV
                             int indent, int indent2, int width);
 
 #ifndef NO_ICONV

-char *reencode_string_iconv(const char *in, size_t insz, iconv_t conv);
-char *reencode_string(const char *in, const char *out_encoding, const char *in_encoding);
+char *reencode_string_iconv(const char *in, size_t insz,
+                           iconv_t conv, int *outsz);
+char *reencode_string_len(const char *in, int insz,
+                         const char *out_encoding,
+                         const char *in_encoding,
+                         int *outsz);

 #else
 #else

-#define reencode_string(a,b,c) NULL
+#define reencode_string_len(a,b,c,d,e) NULL

 #endif
 
 #endif
 

+static inline char *reencode_string(const char *in,
+                                   const char *out_encoding,
+                                   const char *in_encoding)
+{
+       return reencode_string_len(in, strlen(in),
+                                  out_encoding, in_encoding,
+                                  NULL);
+}
+

 int mbs_chrlen(const char **text, size_t *remainder_p, const char *encoding);
 
 #endif
 int mbs_chrlen(const char **text, size_t *remainder_p, const char *encoding);
 
 #endif