d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add missing reaction on LC_ALL and LC_COLLATE

Browse Source
This commit is contained in:
ache 1995-10-23 23:08:26 +00:00
parent b2faa00f39
commit f564fd22e6
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/csh/const.c
View File

@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: const.c,v 1.2 1994/09/24 02:53:48 davidg Exp $
* $Id: const.c,v 1.3 1995/05/30 00:06:29 rgrimes Exp $
*/
#ifndef lint
@ -47,7 +47,9 @@ Char STR0[] = { '0', '\0' };
Char STR1[] = { '1', '\0' };
Char STRHOME[] = { 'H', 'O', 'M', 'E', '\0' };
Char STRLANG[] = { 'L', 'A', 'N', 'G', '\0' };
Char STRLC_CTYPE[] = { 'L', 'C', '_', 'C', 'T', 'Y', 'P', 'E' ,'\0' };
Char STRLC_ALL[] = { 'L', 'C', '_', 'A', 'L', 'L', '\0' };
Char STRLC_CTYPE[] = { 'L', 'C', '_', 'C', 'T', 'Y', 'P', 'E', '\0' };
Char STRLC_COLLATE[] = { 'L', 'C', '_', 'C', 'O', 'L', 'L', 'A', 'T', 'E', '\0' };
Char STRLOGNAME[] = { 'L', 'O', 'G', 'N', 'A', 'M', 'E', '\0' };
Char STRLbrace[] = { '{', '\0' };
Char STRLparen[] = { '(', '\0' };

6
bin/csh/csh.c
View File

@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: csh.c,v 1.4 1995/07/07 22:45:26 ache Exp $
* $Id: csh.c,v 1.5 1995/07/07 23:14:36 ache Exp $
*/
#ifndef lint
@ -186,7 +186,9 @@ main(argc, argv)
AsciiOnly = k > 0377;
}
#else
AsciiOnly = getenv("LANG") == NULL && getenv("LC_CTYPE") == NULL;
AsciiOnly = getenv("LANG") == NULL &&
getenv("LC_ALL") == NULL &&
getenv("LC_CTYPE") == NULL;
#endif /* NLS */
/*

9
bin/csh/func.c
View File

@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: func.c,v 1.2 1994/09/24 02:54:04 davidg Exp $
* $Id: func.c,v 1.3 1995/05/30 00:06:34 rgrimes Exp $
*/
#ifndef lint
@ -967,7 +967,8 @@ dosetenv(v, t)
importpath(lp);
dohash(NULL, NULL);
}
else if (eq(vp, STRLANG) || eq(vp, STRLC_CTYPE)) {
else if (eq(vp, STRLANG) || eq(vp, STRLC_CTYPE) ||
eq(vp, STRLC_ALL) || eq(vp, STRLC_COLLATE)) {
#ifdef NLS
int k;
@ -1015,7 +1016,8 @@ dounsetenv(v, t)
if (!Gmatch(name, *v))
continue;
maxi = 1;
if (eq(name, STRLANG) || eq(name, STRLC_CTYPE)) {
if (eq(name, STRLANG) || eq(name, STRLC_CTYPE) ||
eq(name, STRLC_ALL) || eq(name, STRLC_COLLATE)) {
#ifdef NLS
int k;
@ -1025,6 +1027,7 @@ dounsetenv(v, t)
AsciiOnly = k > 0377;
#else
AsciiOnly = getenv("LANG") == NULL &&
getenv("LC_ALL") == NULL &&
getenv("LC_CTYPE") == NULL;
#endif /* NLS */
}