oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

directory: fix deep path lookup

Browse Source 
This commit fixes a major regression in directory_lookup_directory(),
which broke the deep lookup of directories.
This commit is contained in:
Max Kellermann 2012-01-29 14:42:28 +01:00
parent ee9c460f74
commit f20689519d
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/directory.c
View File

@ -149,34 +149,32 @@ directory_prune_empty(struct directory *directory)
struct directory * struct directory *
directory_lookup_directory(struct directory *directory, const char *uri) directory_lookup_directory(struct directory *directory, const char *uri)
{ {
struct directory *cur = directory;
struct directory *found = NULL;
char *duplicated;
char *locate;
assert(uri != NULL); assert(uri != NULL);
if (isRootDirectory(uri)) if (isRootDirectory(uri))
return directory; return directory;
duplicated = g_strdup(uri); char *duplicated = g_strdup(uri), *name = duplicated;
locate = strchr(duplicated, '/');
while (1) { while (1) {
if (locate) char *slash = strchr(name, '/');
*locate = '\0'; if (slash == name) {
if (!(found = directory_get_child(cur, duplicated))) directory = NULL;
break; break;
assert(cur == found->parent); }
cur = found;
if (!locate) if (slash != NULL)
*slash = '\0';
directory = directory_get_child(directory, name);
if (directory == NULL || slash == NULL)
break; break;
*locate = '/';
locate = strchr(locate + 1, '/'); name = slash + 1;
} }
g_free(duplicated); g_free(duplicated);
return found; return directory;
} }
void void