Attachment 65109 Details for Bug 144073

locale-langpack patch

glibc-2.3.90-langpackdir.diff (text/x-patch), 1.18 KB, created by Thorsten Kukuk on 2006-01-26 07:51:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thorsten Kukuk

Created: 2006-01-26 07:51:56 UTC

Size: 1.18 KB

patch

obsolete

>Index: intl/loadmsgcat.c
>===================================================================
>RCS file: /cvs/glibc/libc/intl/loadmsgcat.c,v
>retrieving revision 1.56
>diff -u -r1.56 loadmsgcat.c
>--- intl/loadmsgcat.c	4 Apr 2005 22:33:01 -0000	1.56
>+++ intl/loadmsgcat.c	26 Jan 2006 07:43:31 -0000
>@@ -806,8 +806,26 @@
>   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);
>+	}
>+      free (filename_langpack);
>+    }
>+  else
>+    /* Try to open the addressed file.  */
>+    fd = open (domain_file->filename, O_RDONLY);
>   if (fd == -1)
>     goto out;
>

Actions: View

Attachments on bug 144073: 63983 | 65109