Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/tcsh/patches/003.locale.patch
author Rich Burridge <rich.burridge@oracle.com>
Tue, 02 May 2017 17:33:26 -0700
changeset 7964 d9801318ed3d
parent 5271 195e24ffa71a
permissions -rw-r--r--
25981468 Build ilmbase and openexr with the GNU compilers
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5271
195e24ffa71a 22527103 update tcsh to 6.19.00
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1073
diff changeset 
     1
 
--- tcsh-6.19.00/sh.c.orig	Tue May 26 11:09:46 2015
195e24ffa71a 22527103 update tcsh to 6.19.00
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1073
diff changeset 
     2
 
+++ tcsh-6.19.00/sh.c	Tue May 26 11:10:09 2015
195e24ffa71a 22527103 update tcsh to 6.19.00
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1073
diff changeset 
     3
 
@@ -176,17 +176,10 @@
1073
c80b2ce240a9 15949286 update tcsh to 6.18.01
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 115
diff changeset 
     4
 
     size_t len;
c80b2ce240a9 15949286 update tcsh to 6.18.01
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 115
diff changeset 
     5
 
     int add_LOC = 1;
c80b2ce240a9 15949286 update tcsh to 6.18.01
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 115
diff changeset 
     6
 
     int add_lang = 1;
c80b2ce240a9 15949286 update tcsh to 6.18.01
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 115
diff changeset 
     7
 
-    char trypath[MAXPATHLEN];
c80b2ce240a9 15949286 update tcsh to 6.18.01
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 115
diff changeset 
     8
 
-    struct stat st;
c80b2ce240a9 15949286 update tcsh to 6.18.01
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 115
diff changeset 
     9
c80b2ce240a9 15949286 update tcsh to 6.18.01
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 115
diff changeset 
    10
 
     if (path == NULL)
c80b2ce240a9 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
1073
c80b2ce240a9 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",
c80b2ce240a9 15949286 update tcsh to 6.18.01
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 115
diff changeset 
    14
 
-	path);
c80b2ce240a9 15949286 update tcsh to 6.18.01
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 115
diff changeset 
    15
 
-    if (stat(trypath, &st) == -1)
c80b2ce240a9 15949286 update tcsh to 6.18.01
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 115
diff changeset 
    16
 
-	return;
c80b2ce240a9 15949286 update tcsh to 6.18.01
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 115
diff changeset 
    17
 
-
c80b2ce240a9 15949286 update tcsh to 6.18.01
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 115
diff changeset 
    18
 
     if ((old = getenv("NLSPATH")) != NULL)
c80b2ce240a9 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. */
c80b2ce240a9 15949286 update tcsh to 6.18.01
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 115
diff changeset 
    20
 
     else
5271
195e24ffa71a 22527103 update tcsh to 6.19.00
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1073
diff changeset 
    21
 
--- tcsh-6.19.00/sh.func.c.orig	Tue May 26 11:10:46 2015
195e24ffa71a 22527103 update tcsh to 6.19.00
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1073
diff changeset 
    22
 
+++ tcsh-6.19.00/sh.func.c	Tue May 26 11:11:47 2015
195e24ffa71a 22527103 update tcsh to 6.19.00
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1073
diff changeset 
    23
 
@@ -2657,6 +2657,8 @@
94
e2364cad23ff 7019782 move tcsh to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    24
1073
c80b2ce240a9 15949286 update tcsh to 6.18.01
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 115
diff changeset 
    25
 
     if (adrof(STRcatalog) != NULL)
c80b2ce240a9 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)));
c80b2ce240a9 15949286 update tcsh to 6.18.01
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 115
diff changeset 
    27
 
+/* for compatibility */
c80b2ce240a9 15949286 update tcsh to 6.18.01
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 115
diff changeset 
    28
 
+#undef NL_CAT_LOCALE
c80b2ce240a9 15949286 update tcsh to 6.18.01
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 115
diff changeset 
    29
 
 #ifdef NL_CAT_LOCALE /* POSIX-compliant. */
c80b2ce240a9 15949286 update tcsh to 6.18.01
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 115
diff changeset 
    30
 
     /*
c80b2ce240a9 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.
upstream/oracle/userland-gate