[PATCH] utf8.c: print warning about disabled iconv
- From
Max Kirillov <max@max630.net>
- Date
- Jun 6, 2015, 21:02 UTC
- Message-ID
- <1433624551-20730-1-git-send-email-max@max630.net>
It is an allowed compile-time option to build git without iconv support. Resulting build almost always functions correctly, and never displays that it is missing anything, but reencode_string_len() just never modifies its input. This gives undesirable result that returned data or even data written into repository is incorrect and user is not aware about it.
Show warning there is non-trivial reencoding requested. Show it only once during program run.
Signed-off-by: Max Kirillov <max@max630.net> --- Hi.
I have noticed there is some activity around the option, so it's not completely abandoned. Maybe then this patch could be useful? utf8.c | 13 +++++++++++++ utf8.h | 5 ++--- 2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/utf8.c b/utf8.c index 520fbb4..b1b836e 100644 --- a/utf8.c +++ b/utf8.c @@ -521,6 +521,19 @@ char *reencode_string_len(const char *in, int insz, iconv_close(conv); return out; } +#else +static int noiconv_warning_shown = 0; + +char *reencode_string_len(const char *in, int insz, + const char *out_encoding, const char *in_encoding, + int *outsz) +{ + if (!same_encoding(in_encoding, out_encoding) && !noiconv_warning_shown) { + warning("Iconv support is disabled at compile time. It is likely that\nincorrect data will be printed or stored in repository.\nConsider using other build for this task."); + noiconv_warning_shown = 1; + } + return NULL; +} #endif /* diff --git a/utf8.h b/utf8.h index e4d9183..3d900f1 100644 --- a/utf8.h +++ b/utf8.h @@ -23,13 +23,12 @@ void strbuf_utf8_replace(struct strbuf *sb, int pos, int width, #ifndef NO_ICONV char *reencode_string_iconv(const char *in, size_t insz, iconv_t conv, int *outsz); +#endif + char *reencode_string_len(const char *in, int insz, const char *out_encoding, const char *in_encoding, int *outsz); -#else -#define reencode_string_len(a,b,c,d,e) NULL -#endif static inline char *reencode_string(const char *in, const char *out_encoding,
-- 2.3.4.2801.g3d0809b