aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWarren Dukes <warren.dukes@gmail.com>2004-11-12 18:02:26 +0000
committerWarren Dukes <warren.dukes@gmail.com>2004-11-12 18:02:26 +0000
commit9dc0b070f066d11bfa8de632980772b323a905e4 (patch)
tree158bf604e6f0b519f51e94a74619e7603004846d /src
parent0473f3ea76c57be8b20e1fae628ec7ae7f04b5f7 (diff)
downloadmpd-9dc0b070f066d11bfa8de632980772b323a905e4.tar.gz
mpd-9dc0b070f066d11bfa8de632980772b323a905e4.tar.xz
mpd-9dc0b070f066d11bfa8de632980772b323a905e4.zip
fix a bug in pringSongUrl, don't print leading '/' for songs in root dir
git-svn-id: https://svn.musicpd.org/mpd/trunk@2631 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to '')
-rw-r--r--src/directory.c2
-rw-r--r--src/song.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/directory.c b/src/directory.c
index d0ea403d0..7bd9b9f61 100644
--- a/src/directory.c
+++ b/src/directory.c
@@ -250,7 +250,7 @@ Directory * newDirectory(char * dirname, Directory * parent) {
directory = malloc(sizeof(Directory));
- if(dirname!=NULL) directory->path = strdup(dirname);
+ if(dirname && strlen(dirname)) directory->path = strdup(dirname);
else directory->path = NULL;
directory->subDirectories = newDirectoryList();
directory->songs = newSongList();
diff --git a/src/song.c b/src/song.c
index 14e4ff9b7..a54c71735 100644
--- a/src/song.c
+++ b/src/song.c
@@ -118,7 +118,7 @@ void freeSongList(SongList * list) {
}
void printSongUrl(FILE * fp, Song * song) {
- if(song->parentDir) {
+ if(song->parentDir && song->parentDir->path) {
myfprintf(fp, "%s%s/%s\n", SONG_FILE,
getDirectoryPath(song->parentDir), song->url);
}