diff options
| author | ru <ru@FreeBSD.org> | 2001-03-02 16:52:14 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2001-03-02 16:52:14 +0000 |
| commit | 3e8d7346e8d524380230b24dff5cb01becde964b (patch) | |
| tree | 225fde80fe94b1fa2ce048160833bd1655dff767 /usr.sbin | |
| parent | a79ec4865fc9fdfd8362a7fb93be50e7ff00c4f9 (diff) | |
| download | FreeBSD-src-3e8d7346e8d524380230b24dff5cb01becde964b.zip FreeBSD-src-3e8d7346e8d524380230b24dff5cb01becde964b.tar.gz | |
setlocale(3) has been fixed to match POSIX standard:
LC_ALL takes precedence over other LC_* envariables.
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/kbdmap/kbdmap.pl | 2 | ||||
| -rw-r--r-- | usr.sbin/named/Makefile.inc | 2 | ||||
| -rwxr-xr-x | usr.sbin/ntp/scripts/mkver | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/kbdmap/kbdmap.pl b/usr.sbin/kbdmap/kbdmap.pl index 6c63777..03536b2 100644 --- a/usr.sbin/kbdmap/kbdmap.pl +++ b/usr.sbin/kbdmap/kbdmap.pl @@ -39,7 +39,7 @@ if ($x11) { sub variables_static { $lang_default = "en"; # set default language - $lang = $ENV{'LC_CTYPE'} || $ENV{'LANG'} || $lang_default; + $lang = $ENV{'LC_ALL'} || $ENV{'LC_CTYPE'} || $ENV{'LANG'} || $lang_default; $lang = &lang($lang); $program = $0; $program =~ s|.*/||; $program =~ s/\.(pl|perl)$//; $keymapdir = "/usr/share/syscons/keymaps"; diff --git a/usr.sbin/named/Makefile.inc b/usr.sbin/named/Makefile.inc index cbebbcb..27b8c40 100644 --- a/usr.sbin/named/Makefile.inc +++ b/usr.sbin/named/Makefile.inc @@ -39,7 +39,7 @@ CLEANFILES+= tmp_version.c pathnames.h CFLAGS+= -I. tmp_version.c: version.c ${BIND_DIR}/Version - (u=$${USER-root} d=`pwd` h=`hostname` t=`LC_TIME=C date`; \ + (u=$${USER-root} d=`pwd` h=`hostname` t=`LC_ALL=C date`; \ sed -e "s|%WHEN%|$${t}|" -e "s|%VERSION%|"${VER}"|" \ -e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \ < ${BIND_DIR}/bin/named/version.c > tmp_version.c) diff --git a/usr.sbin/ntp/scripts/mkver b/usr.sbin/ntp/scripts/mkver index 20996b8..075b197 100755 --- a/usr.sbin/ntp/scripts/mkver +++ b/usr.sbin/ntp/scripts/mkver @@ -9,7 +9,7 @@ case "" in *) ConfStr="$ConfStr RSAREF" ;; esac -ConfStr="$ConfStr 4.0.99b `LC_TIME=C date`" +ConfStr="$ConfStr 4.0.99b `LC_ALL=C date`" if [ ! -f .version ]; then echo 0 > .version |
