(get_charset_aliases): Use path_concat instead of ANSI string
concatenation.
# endif
#endif
+#include "path-concat.h"
+
char *xmalloc ();
char *xrealloc ();
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
{
}
charset_aliases = cp;
+ free (file_name);
}
return cp;