oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Moving localization stuff from path.c to localization.c so we can reuse it

Browse Source 
for log messages when outputting to console.

git-svn-id: https://svn.musicpd.org/mpd/trunk@5225 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
J. Alexander Treuman
2007-01-08 03:15:33 +00:00
parent 4730666b26
commit bcb493cfd3
5 changed files with 127 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/path.c
View File

@@ -22,6 +22,7 @@
#include "conf.h"
#include "utf8.h"
#include "utils.h"
#include "localization.h"
#include <stdlib.h>
#include <string.h>
@@ -31,13 +32,6 @@
#include <errno.h>
#include <dirent.h>
#ifdef HAVE_LOCALE
#ifdef HAVE_LANGINFO_CODESET
#include <locale.h>
#include <langinfo.h>
#endif
#endif
const char *musicDir;
static const char *playlistDir;
static char *fsCharset = NULL;
@@ -135,7 +129,6 @@ void initPaths(void)
ConfigParam *fsCharsetParam = getConfigParam(CONF_FS_CHARSET);
char *charset = NULL;
char *originalLocale;
DIR *dir;
musicDir = appendSlash(&(musicParam->value));
@@ -159,38 +152,12 @@ void initPaths(void)
if (fsCharsetParam) {
charset = xstrdup(fsCharsetParam->value);
} else if ((charset = getLocaleCharset())) {
if (*charset == '\0')
charset = NULL;
else
charset = xstrdup(charset);
}
#ifdef HAVE_LOCALE
#ifdef HAVE_LANGINFO_CODESET
else if ((originalLocale = setlocale(LC_CTYPE, NULL))) {
char *temp;
char *currentLocale;
originalLocale = xstrdup(originalLocale);
if (!(currentLocale = setlocale(LC_CTYPE, ""))) {
WARNING("problems setting current locale with "
"setlocale()\n");
} else {
if (strcmp(currentLocale, "C") == 0 ||
strcmp(currentLocale, "POSIX") == 0) {
WARNING("current locale is \"%s\"\n",
currentLocale);
} else if ((temp = nl_langinfo(CODESET))) {
charset = xstrdup(temp);
} else
WARNING
("problems getting charset for locale\n");
if (!setlocale(LC_CTYPE, originalLocale)) {
WARNING
("problems resetting locale with setlocale()\n");
}
}
free(originalLocale);
} else
WARNING("problems getting locale with setlocale()\n");
#endif
#endif
if (charset) {
setFsCharset(charset);