author | Channappa BV<channappa.vakkalad@oracle.com> |
Wed, 20 Jul 2016 03:28:41 -0700 | |
branch | s11u3-sru |
changeset 6435 | c1b087ff0a7e |
parent 5725 | 144507f0fa50 |
permissions | -rw-r--r-- |
5725
144507f0fa50
22527103 update tcsh to 6.19.00
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
2494
diff
changeset
|
1 |
--- tcsh-6.19.00/sh.c.orig Tue May 26 11:09:46 2015 |
144507f0fa50
22527103 update tcsh to 6.19.00
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
2494
diff
changeset
|
2 |
+++ tcsh-6.19.00/sh.c Tue May 26 11:10:09 2015 |
144507f0fa50
22527103 update tcsh to 6.19.00
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
2494
diff
changeset
|
3 |
@@ -176,17 +176,10 @@ |
2494
c2dd5561bf4f
15949286 update tcsh to 6.18.01
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
115
diff
changeset
|
4 |
size_t len; |
c2dd5561bf4f
15949286 update tcsh to 6.18.01
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
115
diff
changeset
|
5 |
int add_LOC = 1; |
c2dd5561bf4f
15949286 update tcsh to 6.18.01
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
115
diff
changeset
|
6 |
int add_lang = 1; |
c2dd5561bf4f
15949286 update tcsh to 6.18.01
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
115
diff
changeset
|
7 |
- char trypath[MAXPATHLEN]; |
c2dd5561bf4f
15949286 update tcsh to 6.18.01
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
115
diff
changeset
|
8 |
- struct stat st; |
c2dd5561bf4f
15949286 update tcsh to 6.18.01
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
115
diff
changeset
|
9 |
|
c2dd5561bf4f
15949286 update tcsh to 6.18.01
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
115
diff
changeset
|
10 |
if (path == NULL) |
c2dd5561bf4f
15949286 update tcsh to 6.18.01
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
115
diff
changeset
|
11 |
return; |
94
e2364cad23ff
7019782 move tcsh to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
12 |
|
2494
c2dd5561bf4f
15949286 update tcsh to 6.18.01
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
115
diff
changeset
|
13 |
- (void) xsnprintf(trypath, sizeof(trypath), "%s/en/LC_MESSAGES/tcsh.cat", |
c2dd5561bf4f
15949286 update tcsh to 6.18.01
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
115
diff
changeset
|
14 |
- path); |
c2dd5561bf4f
15949286 update tcsh to 6.18.01
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
115
diff
changeset
|
15 |
- if (stat(trypath, &st) == -1) |
c2dd5561bf4f
15949286 update tcsh to 6.18.01
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
115
diff
changeset
|
16 |
- return; |
c2dd5561bf4f
15949286 update tcsh to 6.18.01
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
115
diff
changeset
|
17 |
- |
c2dd5561bf4f
15949286 update tcsh to 6.18.01
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
115
diff
changeset
|
18 |
if ((old = getenv("NLSPATH")) != NULL) |
c2dd5561bf4f
15949286 update tcsh to 6.18.01
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
115
diff
changeset
|
19 |
len = strlen(old) + 1; /* don't forget the colon. */ |
c2dd5561bf4f
15949286 update tcsh to 6.18.01
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
115
diff
changeset
|
20 |
else |
5725
144507f0fa50
22527103 update tcsh to 6.19.00
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
2494
diff
changeset
|
21 |
--- tcsh-6.19.00/sh.func.c.orig Tue May 26 11:10:46 2015 |
144507f0fa50
22527103 update tcsh to 6.19.00
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
2494
diff
changeset
|
22 |
+++ tcsh-6.19.00/sh.func.c Tue May 26 11:11:47 2015 |
144507f0fa50
22527103 update tcsh to 6.19.00
Lukas Rovensky <Lukas.Rovensky@oracle.com>
parents:
2494
diff
changeset
|
23 |
@@ -2657,6 +2657,8 @@ |
94
e2364cad23ff
7019782 move tcsh to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
24 |
|
2494
c2dd5561bf4f
15949286 update tcsh to 6.18.01
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
115
diff
changeset
|
25 |
if (adrof(STRcatalog) != NULL) |
c2dd5561bf4f
15949286 update tcsh to 6.18.01
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
115
diff
changeset
|
26 |
catalog = xasprintf("tcsh.%s", short2str(varval(STRcatalog))); |
c2dd5561bf4f
15949286 update tcsh to 6.18.01
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
115
diff
changeset
|
27 |
+/* for compatibility */ |
c2dd5561bf4f
15949286 update tcsh to 6.18.01
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
115
diff
changeset
|
28 |
+#undef NL_CAT_LOCALE |
c2dd5561bf4f
15949286 update tcsh to 6.18.01
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
115
diff
changeset
|
29 |
#ifdef NL_CAT_LOCALE /* POSIX-compliant. */ |
c2dd5561bf4f
15949286 update tcsh to 6.18.01
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
115
diff
changeset
|
30 |
/* |
c2dd5561bf4f
15949286 update tcsh to 6.18.01
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
115
diff
changeset
|
31 |
* Check if LC_MESSAGES is set in the environment and use it, if so. |