diff options
| author |   naddy <naddy@openbsd.org> | 2015-10-26 15:01:15 +0000 |
|---|---|---|
| committer | naddy <naddy@openbsd.org> | 2015-10-26 15:01:15 +0000 |
| commit | c38c44c77019175ab39d2b6c2d7c32caedd63b6a (patch) | |
| tree | c568d02fcb45fc8864d62ac01696d6b19c877c54 /bin/csh/csh.c | |
| parent | (char *)0 -> NULL (diff) | |
| download | wireguard-openbsd-c38c44c77019175ab39d2b6c2d7c32caedd63b6a.tar.xz wireguard-openbsd-c38c44c77019175ab39d2b6c2d7c32caedd63b6a.zip | |
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 |