diff options
| author | Warren Dukes <warren.dukes@gmail.com> | 2004-04-13 04:59:57 +0000 |
|---|---|---|
| committer | Warren Dukes <warren.dukes@gmail.com> | 2004-04-13 04:59:57 +0000 |
| commit | 1004890e253453faba81126028986f075e5fc5e7 (patch) | |
| tree | 053e319b9c64d0b4a47bd61311007f01150109a7 /src/directory.c | |
| parent | 0927c61533d410ffce6c34f279e1280edab0fbd6 (diff) | |
| download | mpd-1004890e253453faba81126028986f075e5fc5e7.tar.gz mpd-1004890e253453faba81126028986f075e5fc5e7.tar.xz mpd-1004890e253453faba81126028986f075e5fc5e7.zip | |
lots of fsCharset, utf8/ascii converting clean-up and robustness stuff
Also, if fsCharsetToUtf8 can't convert to valid UTF-8, then don't add
it to the db, this way clients don't have to worry about weirdness and it
will force ppl to convert it.
git-svn-id: https://svn.musicpd.org/mpd/trunk@711 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to 'src/directory.c')
| -rw-r--r-- | src/directory.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/src/directory.c b/src/directory.c index 6b1ed9441..b4634c42f 100644 --- a/src/directory.c +++ b/src/directory.c @@ -310,14 +310,18 @@ int removeDeletedFromDirectory(Directory * directory) { while((ent = readdir(dir))) { if(ent->d_name[0]=='.') continue; /* hide hidden stuff */ - utf8 = strdup(fsCharsetToUtf8(ent->d_name)); + utf8 = fsCharsetToUtf8(ent->d_name); + + if(!utf8) continue; + + utf8 = strdup(utf8); if(directory->utf8name) { s = malloc(strlen(directory->utf8name)+strlen(utf8)+2); sprintf(s,"%s/%s",directory->utf8name,utf8); } else s= strdup(utf8); - insertInList(entList,fsCharsetToUtf8(ent->d_name),s); + insertInList(entList,utf8,s); free(utf8); } @@ -377,7 +381,11 @@ int updateDirectory(Directory * directory) { while((ent = readdir(dir))) { if(ent->d_name[0]=='.') continue; /* hide hidden stuff */ - utf8 = strdup(fsCharsetToUtf8(ent->d_name)); + utf8 = fsCharsetToUtf8(ent->d_name); + + if(!utf8) continue; + + utf8 = strdup(utf8); if(directory->utf8name) { s = malloc(strlen(directory->utf8name)+strlen(utf8)+2); @@ -415,7 +423,11 @@ int exploreDirectory(Directory * directory) { while((ent = readdir(dir))) { if(ent->d_name[0]=='.') continue; /* hide hidden stuff */ - utf8 = strdup(fsCharsetToUtf8(ent->d_name)); + utf8 = fsCharsetToUtf8(ent->d_name); + + if(!utf8) continue; + + utf8 = strdup(utf8); DEBUG("explore: found: %s (%s)\n",ent->d_name,utf8); |