diff options
Diffstat (limited to 'src/directory.c')
| -rw-r--r-- | src/directory.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/directory.c b/src/directory.c index af00b90f3..b8e6fa1f0 100644 --- a/src/directory.c +++ b/src/directory.c @@ -101,11 +101,6 @@ void directory_finish(void) freeDirectory(music_root); } -int isRootDirectory(const char *name) -{ - return (!name || name[0] == '\0' || !strcmp(name, "/")); -} - struct directory * directory_get_root(void) { @@ -122,6 +117,8 @@ getSubDirectory(struct directory * directory, const char *name) char *duplicated; char *locate; + assert(name != NULL); + if (isRootDirectory(name)) return directory; @@ -148,6 +145,9 @@ getSubDirectory(struct directory * directory, const char *name) struct directory * getDirectory(const char *name) { + if (name == NULL) + return music_root; + return getSubDirectory(music_root, name); } |