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

playlist_queue: convert absolute paths

Browse Source 
Accept absolute paths if they point into the music directory.
This commit is contained in:
Max Kellermann 2010-01-06 07:58:48 +01:00
parent 8a5d2c3c83
commit 01c5cb985c
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/playlist_queue.c
View File

@ -102,10 +102,22 @@ check_translate_song(struct song *song, const char *base_uri)
}
if (g_path_is_absolute(uri)) {
/* local files must be relative to the music
directory */
song_free(song);
return NULL;
/* XXX fs_charset vs utf8? */
char *prefix = base_uri != NULL
? map_uri_fs(base_uri)
: map_directory_fs(db_get_root());
if (prefix == NULL || !g_str_has_prefix(uri, prefix) ||
uri[strlen(prefix)] != '/') {
/* local files must be relative to the music
directory */
g_free(prefix);
song_free(song);
return NULL;
}
uri += strlen(prefix) + 1;
g_free(prefix);
}
if (base_uri != NULL)