playlist_song: fix playlist files in base music directory

g_path_get_dirname() returns "." when there is no directory name in the given path. This patch adds a workaround for that.

playlist_song: fix playlist files in base music directory
26735390 · Max Kellermann · 9402b23d · 26735390 · 26735390
Commit 26735390 authored May 09, 2011 by Max Kellermann
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

NEWS NEWS +1 -0

playlist_song.c src/playlist_song.c +7 -0

No files found.
--- a/NEWS
+++ b/NEWS
 ver 0.16.3 (2011/??/??)
 * fix assertion failure in audio format mask parser
 * fix NULL pointer dereference in playlist parser
+* fix playlist files in base music directory
 * decoder:
  - ffmpeg: support libavcodec 0.7


--- a/src/playlist_song.c
+++ b/src/playlist_song.c
@@ -105,6 +105,13 @@ playlist_check_translate_song(struct song *song, const char *base_uri)
 		}
 	}

+	if (base_uri != NULL && strcmp(base_uri, ".") == 0)
+		/* g_path_get_dirname() returns "." when there is no
+		   directory name in the given path; clear that now,
+		   because it would break the database lookup
+		   functions */
+		base_uri = NULL;
+
 	if (g_path_is_absolute(uri)) {
 		/* XXX fs_charset vs utf8? */
 		char *prefix = base_uri != NULL