forked from pool/glibc
Andreas Schwab
06263ee4ef
- Update to glibc 2.27 * Optimized x86-64 asin, atan2, exp, expf, log, pow, atan, sin, cosf, sinf, sincosf and tan with FMA * Optimized x86-64 trunc and truncf for processors with SSE4.1 * Optimized generic expf, exp2f, logf, log2f, powf, sinf, cosf and sincosf * In order to support faster and safer process termination the malloc API family of functions will no longer print a failure address and stack backtrace after detecting heap corruption * The abort function terminates the process immediately, without flushing stdio streams * On platforms where long double has the IEEE binary128 format (aarch64, alpha, mips64, riscv, s390 and sparc), the math library now implements _Float128 interfaces for that type, as defined by ISO/IEC TS 18661-3:2015 These are the same interfaces added in version 2.26 for some platforms where this format is supported but is not the format of long double * On platforms with support for _Float64x (aarch64, alpha, i386, ia64, mips64, powerpc64le, riscv, s390, sparc and x86_64), the math library now implements interfaces for that type, as defined by ISO/IEC TS 18661-3:2015 * The math library now implements interfaces for the _Float32, _Float64 and _Float32x types, as defined by ISO/IEC TS 18661-3:2015 * glibc now implements the memfd_create and mlock2 functions on Linux * Support for memory protection keys was added * The copy_file_range function was added * The ldconfig utility now processes `include' directives using the C/POSIX collation ordering * Support for two grammatical forms of month names has been added * Support for the RISC-V ISA running on Linux has been added * Statically compiled applications attempting to load locales compiled for the OBS-URL: https://build.opensuse.org/request/show/572614 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=491
55 lines
1.7 KiB
Diff
55 lines
1.7 KiB
Diff
Index: glibc-2.27/intl/loadmsgcat.c
|
|
===================================================================
|
|
--- glibc-2.27.orig/intl/loadmsgcat.c
|
|
+++ glibc-2.27/intl/loadmsgcat.c
|
|
@@ -796,8 +796,47 @@ _nl_load_domain (struct loaded_l10nfile
|
|
if (domain_file->filename == NULL)
|
|
goto out;
|
|
|
|
- /* Try to open the addressed file. */
|
|
- fd = open (domain_file->filename, O_RDONLY | O_BINARY);
|
|
+ /* Replace /locale/ with /usr/share/locale-langpack/ */
|
|
+ const char *langpackdir = "/usr/share/locale-langpack/";
|
|
+ char *filename_langpack = malloc (strlen (domain_file->filename) +
|
|
+ strlen (langpackdir));
|
|
+ if (filename_langpack != NULL)
|
|
+ {
|
|
+ char *p = strstr (domain_file->filename, "/locale/");
|
|
+ if (p != NULL)
|
|
+ {
|
|
+ strcpy (filename_langpack, langpackdir);
|
|
+ strcpy (&filename_langpack[strlen (langpackdir)], p + 8);
|
|
+ fd = open (filename_langpack, O_RDONLY | O_BINARY);
|
|
+ }
|
|
+
|
|
+ free (filename_langpack);
|
|
+ }
|
|
+
|
|
+ if (fd == -1)
|
|
+ /* Try to open the addressed file. */
|
|
+ fd = open (domain_file->filename, O_RDONLY | O_BINARY);
|
|
+
|
|
+ if (fd == -1)
|
|
+ {
|
|
+ /* Use the fallback directory. */
|
|
+ const char *bundle_dir = "/usr/share/locale-bundle/";
|
|
+ char *filename_bundle = malloc (strlen (domain_file->filename) +
|
|
+ strlen (bundle_dir));
|
|
+ if (filename_bundle != NULL)
|
|
+ {
|
|
+ char *p = strstr (domain_file->filename, "/locale/");
|
|
+ if (p != NULL)
|
|
+ {
|
|
+ strcpy (filename_bundle, bundle_dir);
|
|
+ strcpy (&filename_bundle[strlen (bundle_dir)], p + 8);
|
|
+ fd = open (filename_bundle, O_RDONLY | O_BINARY);
|
|
+ }
|
|
+
|
|
+ free (filename_bundle);
|
|
+ }
|
|
+ }
|
|
+
|
|
if (fd == -1)
|
|
goto out;
|
|
|