diff options
| author | Ruslan Ermilov <ru@FreeBSD.org> | 2001-03-05 13:08:48 +0000 |
|---|---|---|
| committer | Ruslan Ermilov <ru@FreeBSD.org> | 2001-03-05 13:08:48 +0000 |
| commit | dc6a64b2e84e1d8faa4eef4552a215f000cc7a1d (patch) | |
| tree | b729ef837e799adc131941ab0a9ec4283cf7593a /games/morse/morse.c | |
| parent | cab169372f3d997751e9ba695c23567e252c836e (diff) | |
| download | src-dc6a64b2e84e1d8faa4eef4552a215f000cc7a1d.tar.gz src-dc6a64b2e84e1d8faa4eef4552a215f000cc7a1d.zip | |
MFC: fix setlocale(3) so that LC_ALL environment variable (if set
and not NULL) is preferred over other LC_* environment variables,
as required by POSIX.
Notes
Notes:
svn path=/stable/4/; revision=73744
Diffstat (limited to 'games/morse/morse.c')
| -rw-r--r-- | games/morse/morse.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/games/morse/morse.c b/games/morse/morse.c index 38293a73702e..6579e8dd020c 100644 --- a/games/morse/morse.c +++ b/games/morse/morse.c @@ -318,9 +318,9 @@ main(int argc, char **argv) argc -= optind; argv += optind; - if((p = getenv("LC_CTYPE")) || - (p = getenv("LC_ALL")) || - (p = getenv("LANG"))) { + if(((p = getenv("LC_ALL")) && *p) || + ((p = getenv("LC_CTYPE")) && *p) || + ((p = getenv("LANG")) && *p)) { if(strlen(p) >= sizeof(".KOI8-R") && strcasecmp(&p[strlen(p) + 1 - sizeof(".KOI8-R")], ".KOI8-R") == 0) hightab = koi8rtab; |