diff options
| author | Christian Weisgerber <naddy@cvs.openbsd.org> | 2015-10-26 15:01:16 +0000 |
|---|---|---|
| committer | Christian Weisgerber <naddy@cvs.openbsd.org> | 2015-10-26 15:01:16 +0000 |
| commit | 64dc4c6ed3e987e79a9d67a4b96e328bfd57b64c (patch) | |
| tree | 94f17d7c3c9b0d217f1ee688e4d12df0c4823d02 /bin/csh/csh.c | |
| parent | 3449fa5141a1d9cec121c1da43ee347774dc1c59 (diff) | |
unifdef BUILTIN (unused), NLS (always set), SHORT_STRINGS (always set)
and remove a few unused defines; no binary changes; ok tedu@ zhuk@
Diffstat (limited to 'bin/csh/csh.c')
| -rw-r--r-- | bin/csh/csh.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/bin/csh/csh.c b/bin/csh/csh.c index 621aa52f8ed..e04983c699e 100644 --- a/bin/csh/csh.c +++ b/bin/csh/csh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: csh.c,v 1.30 2015/10/22 12:09:03 deraadt Exp $ */ +/* $OpenBSD: csh.c,v 1.31 2015/10/26 15:01:15 naddy Exp $ */ /* $NetBSD: csh.c,v 1.14 1995/04/29 23:21:28 mycroft Exp $ */ /*- @@ -156,7 +156,7 @@ main(int argc, char *argv[]) (void) time(&chktim); AsciiOnly = 1; -#ifdef NLS + (void) setlocale(LC_ALL, ""); if (pledge("stdio rpath wpath cpath fattr getpw proc exec tty", @@ -170,9 +170,6 @@ main(int argc, char *argv[]) continue; AsciiOnly = k > 0377; } -#else - AsciiOnly = getenv("LANG") == NULL && getenv("LC_CTYPE") == NULL; -#endif /* NLS */ /* * Move the descriptors to safe places. The variable didfds is 0 while we |