Skip to content

V
vlc
Commit 5d974e62 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Cleanup directory URI encoding

parent 691503a2
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 3 deletions
modules/access/directory.c
View file @ 5d974e62
...@@ -343,8 +343,8 @@ static block_t *Block (access_t *p_access) ...@@ -343,8 +343,8 @@ static block_t *Block (access_t *p_access)
return NULL; return NULL;
} }
/* Skip current and parent directories */ /* Skip current, parent and hidden directories */
if (entry[0] == '.' ) if (entry[0] == '.')
return NULL; return NULL;
/* Handle recursion */ /* Handle recursion */
if (p_sys->mode != MODE_COLLAPSE) if (p_sys->mode != MODE_COLLAPSE)
...@@ -360,7 +360,12 @@ static block_t *Block (access_t *p_access) ...@@ -360,7 +360,12 @@ static block_t *Block (access_t *p_access)
{ {
sub->parent = current; sub->parent = current;
sub->handle = handle; sub->handle = handle;
sub->uri = encode_path (sub->path);
char *encoded = encode_URI_component (entry);
if ((encoded == NULL)
|| (asprintf (&sub->uri, "%s/%s", current->uri, encoded) == -1))
sub->uri = NULL;
free (encoded);
if ((p_sys->mode == MODE_NONE) if ((p_sys->mode == MODE_NONE)
|| fstat (dirfd (handle), &sub->st) || fstat (dirfd (handle), &sub->st)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment