forked from pool/glibc
63 lines
2.0 KiB
Diff
63 lines
2.0 KiB
Diff
Index: intl/loadmsgcat.c
|
|
===================================================================
|
|
RCS file: /cvs/glibc/libc/intl/loadmsgcat.c,v
|
|
retrieving revision 1.57
|
|
diff -u -p -r1.57 loadmsgcat.c
|
|
--- intl/loadmsgcat.c 28 Jul 2007 20:34:43 -0000 1.57
|
|
+++ intl/loadmsgcat.c 31 Aug 2007 15:36:40 -0000
|
|
@@ -806,8 +806,52 @@ _nl_load_domain (domain_file, domainbind
|
|
if (domain_file->filename == NULL)
|
|
goto out;
|
|
|
|
- /* Try to open the addressed file. */
|
|
- fd = open (domain_file->filename, O_RDONLY);
|
|
+ /* 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));
|
|
+ if ((fd = open (filename_langpack, O_RDONLY)) == -1)
|
|
+ fd = open (domain_file->filename, O_RDONLY);
|
|
+ }
|
|
+ else
|
|
+ /* Try to open the addressed file. */
|
|
+ fd = open (domain_file->filename, O_RDONLY);
|
|
+
|
|
+ free (filename_langpack);
|
|
+ }
|
|
+ else
|
|
+ /* Try to open the addressed file. */
|
|
+ fd = open (domain_file->filename, O_RDONLY);
|
|
+
|
|
+ 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);
|
|
+ }
|
|
+
|
|
+ free (filename_bundle);
|
|
+ }
|
|
+ }
|
|
+
|
|
if (fd == -1)
|
|
goto out;
|
|
|