mirror of
git://git.code.sf.net/p/zsh/code
synced 2025-10-29 05:21:00 +01:00
24592: make types of charset conversion failure more explicit
This commit is contained in:
parent
fd2e321313
commit
f674ea76d2
2 changed files with 8 additions and 3 deletions
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue