From e00b1fa2b032012e741d94f3fe0057d6ea53bf4c Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 21 Jun 2011 12:53:12 +1000 Subject: lib/util: Restore CH_UNIX as source charset for d_printf() I'm changed this during the change to use the d_printf() code in common, but should not have. However, there is a puzzle: What is the right source charset? Translated strings in our .mo and .msg files are in UTF8, but strings such as file names on remote servers are in UNIX (whatever that is). I can't see how this actually works properly when either CH_DISPLAY or CH_UNIX are other than UTF8! Andrew Bartlett Signed-off-by: Andrew Tridgell --- lib/util/dprintf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/util') diff --git a/lib/util/dprintf.c b/lib/util/dprintf.c index a77eed84f5..376eb4c75e 100644 --- a/lib/util/dprintf.c +++ b/lib/util/dprintf.c @@ -48,7 +48,7 @@ static int d_vfprintf(FILE *f, const char *format, va_list ap) if (ret <= 0) return ret; - cret = convert_string_talloc(NULL, CH_UTF8, CH_DISPLAY, p, ret, (void **)&p2, &clen); + cret = convert_string_talloc(NULL, CH_UNIX, CH_DISPLAY, p, ret, (void **)&p2, &clen); if (!cret) { /* the string can't be converted - do the best we can, filling in non-printing chars with '?' */ -- cgit