diff options
| author | Warren Dukes <warren.dukes@gmail.com> | 2004-10-28 04:51:46 +0000 |
|---|---|---|
| committer | Warren Dukes <warren.dukes@gmail.com> | 2004-10-28 04:51:46 +0000 |
| commit | d0532eaf703396e838aa7dba77f58e296f503af5 (patch) | |
| tree | c098d313db0e02d9c957565ce6336465c1d13f50 /src/path.c | |
| parent | fa6f95685b8311be52e32aebc4ac86e8470b1fa3 (diff) | |
| download | mpd-d0532eaf703396e838aa7dba77f58e296f503af5.tar.gz mpd-d0532eaf703396e838aa7dba77f58e296f503af5.tar.xz mpd-d0532eaf703396e838aa7dba77f58e296f503af5.zip | |
new config file format stuff, quick test shows it works
git-svn-id: https://svn.musicpd.org/mpd/branches/shank-rewrite-config@2373 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to 'src/path.c')
| -rw-r--r-- | src/path.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/path.c b/src/path.c index 48d5eff09..1d599bda3 100644 --- a/src/path.c +++ b/src/path.c @@ -114,6 +114,7 @@ void initPaths(char * playlistDirArg, char * musicDirArg) { char * charset = NULL; char * originalLocale; struct stat st; + ConfigParam * param; playlistDir = prependCwdToPathDup(playlistDirArg); if((stat(playlistDir,&st))<0) { @@ -135,8 +136,10 @@ void initPaths(char * playlistDirArg, char * musicDirArg) { exit(EXIT_FAILURE); } - if(getConf()[CONF_FS_CHARSET]) { - charset = strdup(getConf()[CONF_FS_CHARSET]); + param = getConfigParam(CONF_FS_CHARSET); + + if(param) { + charset = strdup(param->value); } #ifdef HAVE_LOCALE #ifdef HAVE_LANGINFO_CODESET @@ -296,5 +299,3 @@ char * prependCwdToPathDup(char * path) { return realloc(ret,len+1); } - -/* vim:set shiftwidth=4 tabstop=8 expandtab: */ |