From 9dc0b070f066d11bfa8de632980772b323a905e4 Mon Sep 17 00:00:00 2001 From: Warren Dukes Date: Fri, 12 Nov 2004 18:02:26 +0000 Subject: 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 --- src/directory.c | 2 +- src/song.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') 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); } -- cgit v1.2.3