Merge branch 'ew/directory'

* ew/directory: (21 commits)
  update: fix multiple deletes from *vec iterators
  directory: children leave parents before being free()ed
  directory: always maintain sorted properties vectors
  update: simplify the serialized_delete usage a bit
  update: remove delete_each_song and clear_directory
  directory: directory_free kills all that it contains
  update: serialize directory deletions
  update: serialize song_free in main thread
  dirvec: introduce locking for all iterators
  dirvec: use dirvec_for_each where it makes sense
  dirvec: add dirvec_for_each iterator
  songvec: avoid holding nr_lock during free(3)
  update: allow music_root updates to be queued
  update: validate in command.c and fix small memory leak
  directory: rename isRootDirectory => path_is_music_root
  Avoid calling isRootDirectory when we have a directory object
  directory: make music_root global and avoid runtime initialization
  directory: use mpd_sizeof_str_flex_array for path, too
  tag_item: avoid wasting space when struct is unpackable
  song: use mpd_sizeof_str_flex_array for song.url
  ...

[ew: fixed up merge errors with myself when isRootDirectory
 went away]

1 files changed, 10 insertions, 4 deletions

diff --git a/src/command.c b/src/command.c
index 518bf5f0d..04e85c6fe 100644
--- a/src/command.c
+++ b/src/command.c
@@ -571,7 +571,7 @@ static int handleLsInfo(int fd, mpd_unused int *permission,
 
 	directory_print(fd, dir);
 
-	if (isRootDirectory(path))
+	if (dir == &music_root)
 		return lsPlaylists(fd, path);
 
 	return 0;
@@ -802,9 +802,15 @@ static int handleUpdate(int fd, mpd_unused int *permission,
 	char *path = NULL;
 
 	assert(argc <= 2);
-	if (argc == 2 && !(path = sanitizePathDup(argv[1]))) {
-		commandError(fd, ACK_ERROR_ARG, "invalid path");
-		return -1;
+	if (argc == 2) {
+		if (!(path = sanitizePathDup(argv[1]))) {
+			commandError(fd, ACK_ERROR_ARG, "invalid path");
+			return -1;
+		}
+		if (path_is_music_root(path)) {
+			free(path);
+			path = NULL;
+		}
 	}
 	return print_update_result(fd, directory_update_init(path));
 }