mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-10-30 17:50:58 +01:00
Code Releases Activity

24592: make types of charset conversion failure more explicit

Browse source
This commit is contained in:
Peter Stephenson 2008-02-26 14:50:00 +00:00
parent fd2e321313
commit f674ea76d2
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2008-02-26 Peter Stephenson <pws@csr.com>
* 24592: Src/utils.c: make errors about charset conversion
more explicit.
2008-02-23 Peter Stephenson <p.w.stephenson@ntlworld.com>
* 24590: Src/exec.c, Src/lex.c: tame overzealous error

6
Src/utils.c
View file

@ -4877,7 +4877,7 @@ getkeystring(char *s, int *len, int how, int *misc)
cd = iconv_open(nl_langinfo(CODESET), "UCS-4BE");
if (cd == (iconv_t)-1) {
zerr("cannot do charset conversion");
zerr("cannot do charset conversion (iconv failed)");
CHARSET_FAILED();
}
count = iconv(cd, &inptr, &inbytes, &t, &outbytes);
@ -4889,12 +4889,12 @@ getkeystring(char *s, int *len, int how, int *misc)
if ((how & GETKEY_UPDATE_OFFSET) && s - sstart < *misc)
(*misc) += count;
# else
zerr("cannot do charset conversion");
zerr("cannot do charset conversion (iconv not available)");
CHARSET_FAILED();
# endif
}
# else
zerr("cannot do charset conversion");
zerr("cannot do charset conversion (NLS not supported)");
CHARSET_FAILED();
# endif
# endif