mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-30 19:20:53 +02:00
Code Releases Activity

20921: using UCS-4BE instead of ISO-10646 to identify character encoding

Browse source 
is more portable, find more encodings in iconv completion on Solaris
20924: make error message more specific
This commit is contained in:
Oliver Kiddle 2005-03-03 14:13:03 +00:00
parent eb82327576
commit 1b50dff802
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,5 +1,10 @@
2005-03-03 Oliver Kiddle <opk@zsh.org> 2005-03-03 Oliver Kiddle <opk@zsh.org>
* 20921, 20924: Src/utils.c, Completion/Unix/Command/_iconv:
using UCS-4BE instead of ISO-10646 to identify character
encoding is more portable; make error message more specific;
find more encodings in iconv completion on Solaris
* Henryk Konsek: 20918 (modified): Completion/Unix/Command/_unace: * Henryk Konsek: 20918 (modified): Completion/Unix/Command/_unace:
new completion for unace new completion for unace

4
Completion/Unix/Command/_iconv
View file

@ -1,7 +1,8 @@
#compdef iconv #compdef iconv
local expl curcontext="$curcontext" state line codeset ret=1 local expl curcontext="$curcontext" state line ret=1
local LOCPATH="${LOCPATH:-/usr/lib/nls/loc}" local LOCPATH="${LOCPATH:-/usr/lib/nls/loc}"
local -U codeset
if _pick_variant gnu=GNU unix --version; then if _pick_variant gnu=GNU unix --version; then
@ -40,6 +41,7 @@ else
if [[ $state = codeset ]]; then if [[ $state = codeset ]]; then
if [[ -f /usr/lib/iconv/iconv_data ]]; then # IRIX & Solaris if [[ -f /usr/lib/iconv/iconv_data ]]; then # IRIX & Solaris
codeset=( ${${(f)"$(</usr/lib/iconv/iconv_data)"}%%[[:blank:]]*} ) codeset=( ${${(f)"$(</usr/lib/iconv/iconv_data)"}%%[[:blank:]]*} )
codeset+=( /usr/lib/iconv/*%*.so(Ne.'reply=( ${${REPLY:t}%%%*} ${${REPLY:r}#*%} )'.) )
elif [[ -d $LOCPATH/iconv ]]; then # OSF elif [[ -d $LOCPATH/iconv ]]; then # OSF
codeset=( $LOCPATH/iconv/*(N:t) ) codeset=( $LOCPATH/iconv/*(N:t) )
codeset=( ${(j:_:s:_:)codeset} ) codeset=( ${(j:_:s:_:)codeset} )

6
Src/utils.c
View file

@ -3617,13 +3617,13 @@ getkeystring(char *s, int *len, int fromwhere, int *misc)
ICONV_CONST char *inptr = inbuf; ICONV_CONST char *inptr = inbuf;
inbytes = 4; inbytes = 4;
outbytes = 6; outbytes = 6;
/* assume big endian convention for UCS-4 */ /* store value in big endian form */
for (i=3;i>=0;i--) { for (i=3;i>=0;i--) {
inbuf[i] = wval & 0xff; inbuf[i] = wval & 0xff;
wval >>= 8; wval >>= 8;
} }
cd = iconv_open(nl_langinfo(CODESET), "ISO-10646"); cd = iconv_open(nl_langinfo(CODESET), "UCS-4BE");
if (cd == (iconv_t)-1) { if (cd == (iconv_t)-1) {
zerr("cannot do charset conversion", NULL, 0); zerr("cannot do charset conversion", NULL, 0);
if (fromwhere == 4) { if (fromwhere == 4) {
@ -3637,7 +3637,7 @@ getkeystring(char *s, int *len, int fromwhere, int *misc)
count = iconv(cd, &inptr, &inbytes, &t, &outbytes); count = iconv(cd, &inptr, &inbytes, &t, &outbytes);
iconv_close(cd); iconv_close(cd);
if (count == (size_t)-1) { if (count == (size_t)-1) {
zerr("cannot do charset conversion", NULL, 0); zerr("character not in range", NULL, 0);
*t = '\0'; *t = '\0';
*len = t - buf; *len = t - buf;
return buf; return buf;