From df8dbb37bbf199978680058891dfa9bbd5d90b74 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 4 Oct 2006 21:52:15 +0000 Subject: set iutf8 if appropriate (#186961) handle non-utf8 locales correctly (#200100) --- lang.csh | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) (limited to 'lang.csh') diff --git a/lang.csh b/lang.csh index 1b26d902..334a6294 100755 --- a/lang.csh +++ b/lang.csh @@ -25,6 +25,8 @@ if ($sourced == 1) then unsetenv LC_ALL endif endif + + set consoletype=`/sbin/consoletype` if ($?CHARSET) then switch ($CHARSET) @@ -36,7 +38,7 @@ if ($sourced == 1) then case latin2*: if ( $?TERM ) then if ( "$TERM" == "linux" ) then - if ( `/sbin/consoletype` == "vt" ) then + if ( "$consoletype" == "vt" ) then /bin/echo -n -e '\033(K' >/dev/tty endif endif @@ -54,7 +56,7 @@ if ($sourced == 1) then case latin2-ucw*: if ( $?TERM ) then if ( "$TERM" == "linux" ) then - if ( `/sbin/consoletype` == "vt" ) then + if ( "$consoletype" == "vt" ) then /bin/echo -n -e '\033(K' > /dev/tty endif endif @@ -66,9 +68,12 @@ if ($sourced == 1) then switch ($LANG) case *.utf8*: case *.UTF-8*: + if ( "$consoletype" == "vt" || "$consoletype" == "pty" ) then + stty iutf8 + endif if ( $?TERM ) then if ( "$TERM" == "linux" ) then - if ( `/sbin/consoletype` == "vt" ) then + if ( "$consoletype" == "vt" ) then if ( -x /bin/unicode_start ) then if { /sbin/consoletype fg } then if ( $?SYSFONT ) then @@ -84,6 +89,22 @@ if ($sourced == 1) then endif endif breaksw + case *: + if ( "$consoletype" == "vt" || "$consoletype" == "pty" ) then + stty -iutf8 + endif + if ( $?TERM ) then + if ( "$TERM" == "linux" ) then + if ( "$consoletype" == "vt" ) then + if ( -x /bin/unicode_stop ) then + if { /sbin/consoletype fg } then + /bin/unicode_stop + endif + endif + endif + endif + endif + breaksw endsw endif unsetenv SYSFONTACM -- cgit