diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-06-21 12:53:12 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2011-06-21 15:54:44 +1000 |
| commit | e00b1fa2b032012e741d94f3fe0057d6ea53bf4c (patch) | |
| tree | 64f6b3a27b3f9e462631d2e6d70befdcc74f9ad4 | |
| parent | bf83b641e265a7b1523545294c268c6708999d2a (diff) | |
| download | samba-e00b1fa2b032012e741d94f3fe0057d6ea53bf4c.tar.gz samba-e00b1fa2b032012e741d94f3fe0057d6ea53bf4c.tar.bz2 samba-e00b1fa2b032012e741d94f3fe0057d6ea53bf4c.zip | |
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 <tridge@samba.org>
| -rw-r--r-- | lib/util/dprintf.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 '?' */ |