File glibc-2.3.90-langpackdir.diff of Package glibc

Overview Repositories Revisions Requests Users Attributes Meta

File glibc-2.3.90-langpackdir.diff of Package glibc (Revision 8d87e03157a4f2005d83c5958393c68e)

Currently displaying revision 8d87e03157a4f2005d83c5958393c68e , Show latest

Index: glibc-2.38/intl/loadmsgcat.c
===================================================================
--- glibc-2.38.orig/intl/loadmsgcat.c
+++ glibc-2.38/intl/loadmsgcat.c
@@ -796,8 +796,26 @@ _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 (__stpcpy (filename_langpack, 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)
     goto out;

Places

File glibc-2.3.90-langpackdir.diff of Package glibc (Revision 8d87e03157a4f2005d83c5958393c68e)

Places