Commit 39401d06 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Use Unicode wrappers to open HTTP interface files

parent 2beb123a
......@@ -639,8 +639,7 @@ int E_(HttpCallback)( httpd_file_sys_t *p_args,
char **pp_data = (char **)_pp_data;
FILE *f;
/* FIXME: do we need character encoding translation here? */
if( ( f = fopen( p_args->file, "r" ) ) == NULL )
if( ( f = utf8_fopen( p_args->file, "r" ) ) == NULL )
{
Callback404( p_args, pp_data, pi_data );
return VLC_SUCCESS;
......
......@@ -213,11 +213,10 @@ int E_(ParseDirectory)( intf_thread_t *p_intf, char *psz_root,
httpd_file_sys_t *f = NULL;
httpd_handler_sys_t *h = NULL;
vlc_bool_t b_index;
char *psz_file, *psz_name, *psz_ext;
char *psz_name, *psz_ext;
psz_file = E_(FromUTF8)( p_intf, dir );
psz_name = E_(FileToUrl)( &dir[strlen( psz_root )], &b_index );
psz_ext = strrchr( psz_file, '.' );
psz_ext = strrchr( dir, '.' );
if( psz_ext != NULL )
{
int i;
......@@ -243,7 +242,7 @@ int E_(ParseDirectory)( intf_thread_t *p_intf, char *psz_root,
f->p_file = NULL;
f->p_redir = NULL;
f->p_redir2 = NULL;
f->file = psz_file;
f->file = strdup (dir);
f->name = psz_name;
f->b_html = strstr( &dir[strlen( psz_root )], ".htm" ) || strstr( &dir[strlen( psz_root )], ".xml" ) ? VLC_TRUE : VLC_FALSE;
......
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