("path-concat.h"): Include.

(get_charset_aliases): Use path_concat instead of ANSI string
concatenation.

diff --git a/lib/localcharset.c b/lib/localcharset.c
index 461320823d8a827489b2d5c753a297c9c028523f..86f7ed1b2e09ba35cfad1de6e47ccc7155352952 100644 (file)
--- a/lib/localcharset.c
+++ b/lib/localcharset.c
@@ -45,6 +45,8 @@
 # endif
 #endif
 
+#include "path-concat.h"
+
 char *xmalloc ();
 char *xrealloc ();
 
@@ -69,10 +71,10 @@ get_charset_aliases ()
   if (cp == NULL)
     {
       FILE *fp;
+      char *file_name = path_concat (LIBDIR, "charset.alias", NULL);
 
-      fp = fopen (LIBDIR "/" "charset.alias", "r");
-      if (fp == NULL)
-       /* File not found, treat it as empty.  */
+      if (file_name == NULL || (fp = fopen (file_name, "r")) == NULL)
+       /* Out of memory or file not found, treat it as empty.  */
        cp = "";
       else
        {
@@ -130,6 +132,7 @@ get_charset_aliases ()
        }
 
       charset_aliases = cp;
+      free (file_name);
     }
 
   return cp;