From c408bd5e903da0441f461aa564095ec581cb3cfd Mon Sep 17 00:00:00 2001 From: "J. Alexander Treuman" Date: Thu, 24 May 2007 17:06:59 +0000 Subject: Don't list playlists in lsinfo if the path isn't the root directory (they can't be loaded anyway). git-svn-id: https://svn.musicpd.org/mpd/trunk@6244 09075e82-0dd4-0310-85a5-a0d7c8717e4f --- src/command.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'src/command.c') diff --git a/src/command.c b/src/command.c index 107df3275..c8f39472d 100644 --- a/src/command.c +++ b/src/command.c @@ -402,17 +402,18 @@ static int handleListPlaylistInfo(int fd, int *permission, static int handleLsInfo(int fd, int *permission, int argc, char *argv[]) { - if (argc == 1) { - if (printDirectoryInfo(fd, NULL) < 0) - return -1; - else - return lsPlaylists(fd, ""); - } else { - if (printDirectoryInfo(fd, argv[1]) < 0) - return -1; - else - return lsPlaylists(fd, argv[1]); - } + char *path = ""; + + if (argc == 2) + path = argv[1]; + + if (printDirectoryInfo(fd, path) < 0) + return -1; + + if (isRootDirectory(path)) + return lsPlaylists(fd, path); + + return 0; } static int handleRm(int fd, int *permission, int argc, char *argv[]) -- cgit v1.2.3