| author | James Chang <james.c.chang@Oracle.COM> |
| Wed, 03 Jun 2015 16:57:58 -0700 | |
| changeset 4402 | b7cd2462c58f |
| child 5391 | 5aa4a8c4577f |
| permissions | -rw-r--r-- |
|
4402
b7cd2462c58f
20460412 GGREP should have some master test results to compare against
James Chang <james.c.chang@Oracle.COM>
parents:
diff
changeset
|
1 |
# This patch fixes the core dump and locale issues previously seen in |
|
b7cd2462c58f
20460412 GGREP should have some master test results to compare against
James Chang <james.c.chang@Oracle.COM>
parents:
diff
changeset
|
2 |
# the test-mbrtowc3.sh, test-mbrtowc4.sh and test-mbsrtowcs4.sh tests. |
|
b7cd2462c58f
20460412 GGREP should have some master test results to compare against
James Chang <james.c.chang@Oracle.COM>
parents:
diff
changeset
|
3 |
# __getlocalename_l is an Oracle private interface. |
|
b7cd2462c58f
20460412 GGREP should have some master test results to compare against
James Chang <james.c.chang@Oracle.COM>
parents:
diff
changeset
|
4 |
# Do not send this patch upstream. |
|
b7cd2462c58f
20460412 GGREP should have some master test results to compare against
James Chang <james.c.chang@Oracle.COM>
parents:
diff
changeset
|
5 |
|
|
b7cd2462c58f
20460412 GGREP should have some master test results to compare against
James Chang <james.c.chang@Oracle.COM>
parents:
diff
changeset
|
6 |
diff -rup grep-2.20-orig/gnulib-tests/localename.c grep-2.20/gnulib-tests/localename.c |
|
b7cd2462c58f
20460412 GGREP should have some master test results to compare against
James Chang <james.c.chang@Oracle.COM>
parents:
diff
changeset
|
7 |
--- grep-2.20-orig/gnulib-tests/localename.c 2014-01-01 17:36:42.000000000 -0800 |
|
b7cd2462c58f
20460412 GGREP should have some master test results to compare against
James Chang <james.c.chang@Oracle.COM>
parents:
diff
changeset
|
8 |
+++ grep-2.20/gnulib-tests/localename.c 2015-05-28 14:48:57.639643024 -0700 |
|
b7cd2462c58f
20460412 GGREP should have some master test results to compare against
James Chang <james.c.chang@Oracle.COM>
parents:
diff
changeset
|
9 |
@@ -2644,6 +2644,9 @@ gl_locale_name_thread_unsafe (int catego |
|
b7cd2462c58f
20460412 GGREP should have some master test results to compare against
James Chang <james.c.chang@Oracle.COM>
parents:
diff
changeset
|
10 |
return ""; |
|
b7cd2462c58f
20460412 GGREP should have some master test results to compare against
James Chang <james.c.chang@Oracle.COM>
parents:
diff
changeset
|
11 |
} |
|
b7cd2462c58f
20460412 GGREP should have some master test results to compare against
James Chang <james.c.chang@Oracle.COM>
parents:
diff
changeset
|
12 |
return querylocale (mask, thread_locale); |
|
b7cd2462c58f
20460412 GGREP should have some master test results to compare against
James Chang <james.c.chang@Oracle.COM>
parents:
diff
changeset
|
13 |
+# elif defined(sun) || defined(__sun) || defined(__sun__) |
|
b7cd2462c58f
20460412 GGREP should have some master test results to compare against
James Chang <james.c.chang@Oracle.COM>
parents:
diff
changeset
|
14 |
+ extern char * __getlocalename_l(int, locale_t); |
|
b7cd2462c58f
20460412 GGREP should have some master test results to compare against
James Chang <james.c.chang@Oracle.COM>
parents:
diff
changeset
|
15 |
+ return __getlocalename_l (category, thread_locale); |
|
b7cd2462c58f
20460412 GGREP should have some master test results to compare against
James Chang <james.c.chang@Oracle.COM>
parents:
diff
changeset
|
16 |
# endif |
|
b7cd2462c58f
20460412 GGREP should have some master test results to compare against
James Chang <james.c.chang@Oracle.COM>
parents:
diff
changeset
|
17 |
} |
|
b7cd2462c58f
20460412 GGREP should have some master test results to compare against
James Chang <james.c.chang@Oracle.COM>
parents:
diff
changeset
|
18 |
} |