diff -urN mpd-0.13.2.orig/src/directory.c mpd-0.13.2/src/directory.c

--- mpd-0.13.2.orig/src/directory.c	2008-01-27 00:16:46 +0200

+++ mpd-0.13.2/src/directory.c	2008-07-06 02:15:11 +0300

@@ -296,7 +296,7 @@

 	void *song;

 	if (findInList(directory->songs, shortname, &song)) {

-		LOG("removing: %s\n", getSongUrl((Song *) song));

+		LOG("removing: %s\n", utf8ToFsCharset(getSongUrl((Song *) song)));

 		deleteFromList(directory->songs, shortname);

 	}

 }

@@ -338,7 +338,7 @@

 			addToDirectory(directory, shortname, name);

 			return DIRECTORY_RETURN_UPDATE;

 		} else if (st.st_mtime != ((Song *) song)->mtime) {

-			LOG("updating %s\n", name);

+			LOG("updating %s\n", utf8ToFsCharset(name));

 			if (updateSongInfo((Song *) song) < 0) {

 				removeSongFromDirectory(directory, shortname);

 			}

@@ -407,14 +407,14 @@

 		tmpNode = node->nextNode;

 		if (findInList(entList, node->key, &name)) {

 			if (!isDir((char *)name)) {

-				LOG("removing directory: %s\n", (char *)name);

+				LOG("removing directory: %s\n", utf8ToFsCharset((char *)name));

 				deleteFromList(directory->subDirectories,

 					       node->key);

 				ret = 1;

 			}

 		} else {

 			LOG("removing directory: %s/%s\n",

-			    getDirectoryPath(directory), node->key);

+			    utf8ToFsCharset(getDirectoryPath(directory)), utf8ToFsCharset(node->key));

 			deleteFromList(directory->subDirectories, node->key);

 			ret = 1;

 		}

@@ -547,7 +547,7 @@

 		}

 		/* if updateDirectory fails, means we should delete it */

 		else {

-			LOG("removing directory: %s\n", path);

+			LOG("removing directory: %s\n", utf8ToFsCharset(path));

 			deleteFromList(parentDirectory->subDirectories,

 				       shortname);

 			ret = 1;

@@ -799,7 +799,7 @@

 				     SONG_TYPE_FILE, directory);

 		if (!song)

 			return -1;

-		LOG("added %s\n", name);

+		LOG("added %s\n", utf8ToFsCharset(name));

 		return 1;

 	} else if (S_ISDIR(st.st_mode)) {

 		return addSubDirectoryToDirectory(directory, shortname, name,