(get_charset_aliases): Use path_concat instead of ANSI string
concatenation.
+#include "path-concat.h"
+
char *xmalloc ();
char *xrealloc ();
char *xmalloc ();
char *xrealloc ();
if (cp == NULL)
{
FILE *fp;
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. */