X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcontrol%2Fhttp%2Futil.c;h=067d4bb784d7982b6455a643b0bea18dac74e1e3;hb=9583bbb88add075efd2e6ae77be3e411c235d44a;hp=10920baa04317ce8b7d2755172506333d6f80ae0;hpb=fe9e45cc87e5e966a945c5638d3c74c548811ded;p=vlc diff --git a/modules/control/http/util.c b/modules/control/http/util.c index 10920baa04..067d4bb784 100644 --- a/modules/control/http/util.c +++ b/modules/control/http/util.c @@ -23,8 +23,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include #include "http.h" #include "vlc_strings.h" @@ -33,13 +36,13 @@ ****************************************************************************/ /* ToUrl: create a good name for an url from filename */ -char *E_(FileToUrl)( char *name, vlc_bool_t *pb_index ) +char *FileToUrl( char *name, bool *pb_index ) { char *url, *p; url = p = malloc( strlen( name ) + 1 ); - *pb_index = VLC_FALSE; + *pb_index = false; if( !url || !p ) { return NULL; @@ -74,14 +77,14 @@ char *E_(FileToUrl)( char *name, vlc_bool_t *pb_index ) if( !strncmp( p, "/index.", 7 ) ) { p[1] = '\0'; - *pb_index = VLC_TRUE; + *pb_index = true; } } return url; } /* Load a file */ -int E_(FileLoad)( FILE *f, char **pp_data, int *pi_data ) +int FileLoad( FILE *f, char **pp_data, int *pi_data ) { int i_read; @@ -103,14 +106,11 @@ int E_(FileLoad)( FILE *f, char **pp_data, int *pi_data ) } /* Parse a directory and recursively add files */ -int E_(ParseDirectory)( intf_thread_t *p_intf, char *psz_root, +int ParseDirectory( intf_thread_t *p_intf, char *psz_root, char *psz_dir ) { intf_sys_t *p_sys = p_intf->p_sys; char dir[MAX_DIR_SIZE]; -#ifdef HAVE_SYS_STAT_H - struct stat stat_info; -#endif DIR *p_dir; vlc_acl_t *p_acl; FILE *file; @@ -128,16 +128,10 @@ int E_(ParseDirectory)( intf_thread_t *p_intf, char *psz_root, sep = '/'; #endif -#ifdef HAVE_SYS_STAT_H - if( utf8_stat( psz_dir, &stat_info ) == -1 || !S_ISDIR( stat_info.st_mode ) ) - { - return VLC_EGENERIC; - } -#endif - if( ( p_dir = utf8_opendir( psz_dir ) ) == NULL ) { - msg_Err( p_intf, "cannot open directory (%s)", psz_dir ); + if( errno != ENOENT && errno != ENOTDIR ) + msg_Err( p_intf, "cannot open directory (%s)", psz_dir ); return VLC_EGENERIC; } @@ -145,12 +139,13 @@ int E_(ParseDirectory)( intf_thread_t *p_intf, char *psz_root, if( i_dirlen + 10 > MAX_DIR_SIZE ) { msg_Warn( p_intf, "skipping too deep directory (%s)", psz_dir ); + closedir( p_dir ); return 0; } msg_Dbg( p_intf, "dir=%s", psz_dir ); - sprintf( dir, "%s%c.access", psz_dir, sep ); + snprintf( dir, sizeof( dir ), "%s%c.access", psz_dir, sep ); if( ( file = utf8_fopen( dir, "r" ) ) != NULL ) { char line[1024]; @@ -184,17 +179,24 @@ int E_(ParseDirectory)( intf_thread_t *p_intf, char *psz_root, fclose( file ); } - sprintf( dir, "%s%c.hosts", psz_dir, sep ); - p_acl = ACL_Create( p_intf, VLC_FALSE ); + snprintf( dir, sizeof( dir ), "%s%c.hosts", psz_dir, sep ); + p_acl = ACL_Create( p_intf, false ); if( ACL_LoadFile( p_acl, dir ) ) { ACL_Destroy( p_acl ); + + struct stat st; + if( stat( dir, &st ) == 0 ) + { + closedir( p_dir ); + return VLC_EGENERIC; + } p_acl = NULL; } for( ;; ) { - const char *psz_filename; + char *psz_filename; /* parse psz_src dir */ if( ( psz_filename = utf8_readdir( p_dir ) ) == NULL ) { @@ -203,19 +205,22 @@ int E_(ParseDirectory)( intf_thread_t *p_intf, char *psz_root, if( ( psz_filename[0] == '.' ) || ( i_dirlen + strlen( psz_filename ) > MAX_DIR_SIZE ) ) + { + free( psz_filename ); continue; + } - sprintf( dir, "%s%c%s", psz_dir, sep, psz_filename ); - free( (char*) psz_filename ); + snprintf( dir, sizeof( dir ), "%s%c%s", psz_dir, sep, psz_filename ); + free( psz_filename ); - if( E_(ParseDirectory)( p_intf, psz_root, dir ) ) + if( ParseDirectory( p_intf, psz_root, dir ) ) { httpd_file_sys_t *f = NULL; httpd_handler_sys_t *h = NULL; - vlc_bool_t b_index; + bool b_index; char *psz_name, *psz_ext; - psz_name = E_(FileToUrl)( &dir[strlen( psz_root )], &b_index ); + psz_name = FileToUrl( &dir[strlen( psz_root )], &b_index ); psz_ext = strrchr( dir, '.' ); if( psz_ext != NULL ) { @@ -228,14 +233,14 @@ int E_(ParseDirectory)( intf_thread_t *p_intf, char *psz_root, { f = malloc( sizeof( httpd_handler_sys_t ) ); h = (httpd_handler_sys_t *)f; - f->b_handler = VLC_TRUE; + f->b_handler = true; h->p_association = p_sys->pp_handlers[i]; } } if( f == NULL ) { f = malloc( sizeof( httpd_file_sys_t ) ); - f->b_handler = VLC_FALSE; + f->b_handler = false; } f->p_intf = p_intf; @@ -244,7 +249,7 @@ int E_(ParseDirectory)( intf_thread_t *p_intf, char *psz_root, f->p_redir2 = NULL; 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; + f->b_html = strstr( &dir[strlen( psz_root )], ".htm" ) || strstr( &dir[strlen( psz_root )], ".xml" ) ? true : false; if( !f->name ) { @@ -258,7 +263,7 @@ int E_(ParseDirectory)( intf_thread_t *p_intf, char *psz_root, if( !f->b_handler ) { - char *psz_type = strdup( p_sys->psz_html_type ); + char *psz_type = strdup( "text/html; charset=UTF-8" ); if( strstr( &dir[strlen( psz_root )], ".xml" ) ) { char *psz = strstr( psz_type, "html;" ); @@ -275,7 +280,7 @@ int E_(ParseDirectory)( intf_thread_t *p_intf, char *psz_root, f->name, f->b_html ? psz_type : NULL, user, password, p_acl, - E_(HttpCallback), f ); + HttpCallback, f ); free( psz_type ); if( f->p_file != NULL ) { @@ -287,7 +292,7 @@ int E_(ParseDirectory)( intf_thread_t *p_intf, char *psz_root, h->p_handler = httpd_HandlerNew( p_sys->p_httpd_host, f->name, user, password, p_acl, - E_(HandlerCallback), h ); + HandlerCallback, h ); if( h->p_handler != NULL ) { TAB_APPEND( p_sys->i_files, p_sys->pp_files, @@ -322,14 +327,8 @@ int E_(ParseDirectory)( intf_thread_t *p_intf, char *psz_root, } } - if( user ) - { - free( user ); - } - if( password ) - { - free( password ); - } + free( user ); + free( password ); ACL_Destroy( p_acl ); closedir( p_dir ); @@ -338,78 +337,10 @@ int E_(ParseDirectory)( intf_thread_t *p_intf, char *psz_root, } -/************************************************************************** - * Locale functions - **************************************************************************/ -char *E_(FromUTF8)( intf_thread_t *p_intf, char *psz_utf8 ) -{ - intf_sys_t *p_sys = p_intf->p_sys; - - if ( p_sys->iconv_from_utf8 != (vlc_iconv_t)-1 ) - { - size_t i_in = strlen(psz_utf8); - size_t i_out = i_in * 2; - char *psz_local = malloc(i_out + 1); - char *psz_out = psz_local; - size_t i_ret; - char psz_tmp[i_in + 1]; - const char *psz_in = psz_tmp; - strcpy( psz_tmp, psz_utf8 ); - - i_in = strlen( psz_tmp ); - - i_ret = vlc_iconv( p_sys->iconv_from_utf8, &psz_in, &i_in, - &psz_out, &i_out ); - if( i_ret == (size_t)-1 || i_in ) - { - msg_Warn( p_intf, - "failed to convert \"%s\" to desired charset (%s)", - psz_utf8, strerror(errno) ); - free( psz_local ); - return strdup( psz_utf8 ); - } - - *psz_out = '\0'; - return psz_local; - } - else - return strdup( psz_utf8 ); -} - -char *E_(ToUTF8)( intf_thread_t *p_intf, char *psz_local ) -{ - intf_sys_t *p_sys = p_intf->p_sys; - - if ( p_sys->iconv_to_utf8 != (vlc_iconv_t)-1 ) - { - const char *psz_in = psz_local; - size_t i_in = strlen(psz_in); - size_t i_out = i_in * 6; - char *psz_utf8 = malloc(i_out + 1); - char *psz_out = psz_utf8; - - size_t i_ret = vlc_iconv( p_sys->iconv_to_utf8, &psz_in, &i_in, - &psz_out, &i_out ); - if( i_ret == (size_t)-1 || i_in ) - { - msg_Warn( p_intf, - "failed to convert \"%s\" to desired charset (%s)", - psz_local, strerror(errno) ); - free( psz_utf8 ); - return strdup( psz_local ); - } - - *psz_out = '\0'; - return psz_utf8; - } - else - return strdup( psz_local ); -} - /************************************************************************* * Playlist stuff *************************************************************************/ -void E_(PlaylistListNode)( intf_thread_t *p_intf, playlist_t *p_pl, +void PlaylistListNode( intf_thread_t *p_intf, playlist_t *p_pl, playlist_item_t *p_node, char *name, mvar_t *s, int i_depth ) { @@ -419,87 +350,85 @@ void E_(PlaylistListNode)( intf_thread_t *p_intf, playlist_t *p_pl, { char value[512]; char *psz; - mvar_t *itm = E_(mvar_New)( name, "set" ); + mvar_t *itm = mvar_New( name, "set" ); if( p_pl->status.p_item && p_node && p_pl->status.p_item->p_input && p_node->p_input && p_pl->status.p_item->p_input->i_id == p_node->p_input->i_id ) { - E_(mvar_AppendNewVar)( itm, "current", "1" ); + mvar_AppendNewVar( itm, "current", "1" ); } else { - E_(mvar_AppendNewVar)( itm, "current", "0" ); + mvar_AppendNewVar( itm, "current", "0" ); } - sprintf( value, "%d", p_node->p_input->i_id ); - E_(mvar_AppendNewVar)( itm, "index", value ); + sprintf( value, "%d", p_node->i_id ); + mvar_AppendNewVar( itm, "index", value ); - psz = E_(FromUTF8)( p_intf, p_node->p_input->psz_name ); - E_(mvar_AppendNewVar)( itm, "name", psz ); + psz = input_item_GetName( p_node->p_input ); + mvar_AppendNewVar( itm, "name", psz ); free( psz ); - psz = E_(FromUTF8)( p_intf, p_node->p_input->psz_uri ); - E_(mvar_AppendNewVar)( itm, "uri", psz ); + psz = input_item_GetURI( p_node->p_input ); + mvar_AppendNewVar( itm, "uri", psz ); free( psz ); sprintf( value, "Item"); - E_(mvar_AppendNewVar)( itm, "type", value ); + mvar_AppendNewVar( itm, "type", value ); sprintf( value, "%d", i_depth ); - E_(mvar_AppendNewVar)( itm, "depth", value ); + mvar_AppendNewVar( itm, "depth", value ); if( p_node->i_flags & PLAYLIST_RO_FLAG ) { - E_(mvar_AppendNewVar)( itm, "ro", "ro" ); + mvar_AppendNewVar( itm, "ro", "ro" ); } else { - E_(mvar_AppendNewVar)( itm, "ro", "rw" ); + mvar_AppendNewVar( itm, "ro", "rw" ); } - sprintf( value, "%ld", (long)p_node->p_input->i_duration ); - E_(mvar_AppendNewVar)( itm, "duration", value ); + sprintf( value, "%ld", + (long) input_item_GetDuration( p_node->p_input ) ); + mvar_AppendNewVar( itm, "duration", value ); - E_(mvar_AppendVar)( s, itm ); + mvar_AppendVar( s, itm ); } else { char value[512]; - char *psz; int i_child; - mvar_t *itm = E_(mvar_New)( name, "set" ); + mvar_t *itm = mvar_New( name, "set" ); - psz = E_(FromUTF8)( p_intf, p_node->p_input->psz_name ); - E_(mvar_AppendNewVar)( itm, "name", psz ); - E_(mvar_AppendNewVar)( itm, "uri", psz ); - free( psz ); + mvar_AppendNewVar( itm, "name", p_node->p_input->psz_name ); + mvar_AppendNewVar( itm, "uri", p_node->p_input->psz_name ); sprintf( value, "Node" ); - E_(mvar_AppendNewVar)( itm, "type", value ); + mvar_AppendNewVar( itm, "type", value ); - sprintf( value, "%d", p_node->p_input->i_id ); - E_(mvar_AppendNewVar)( itm, "index", value ); + sprintf( value, "%d", p_node->i_id ); + mvar_AppendNewVar( itm, "index", value ); sprintf( value, "%d", p_node->i_children); - E_(mvar_AppendNewVar)( itm, "i_children", value ); + mvar_AppendNewVar( itm, "i_children", value ); sprintf( value, "%d", i_depth ); - E_(mvar_AppendNewVar)( itm, "depth", value ); + mvar_AppendNewVar( itm, "depth", value ); if( p_node->i_flags & PLAYLIST_RO_FLAG ) { - E_(mvar_AppendNewVar)( itm, "ro", "ro" ); + mvar_AppendNewVar( itm, "ro", "ro" ); } else { - E_(mvar_AppendNewVar)( itm, "ro", "rw" ); + mvar_AppendNewVar( itm, "ro", "rw" ); } - E_(mvar_AppendVar)( s, itm ); + mvar_AppendVar( s, itm ); for (i_child = 0 ; i_child < p_node->i_children ; i_child++) - E_(PlaylistListNode)( p_intf, p_pl, + PlaylistListNode( p_intf, p_pl, p_node->pp_children[i_child], name, s, i_depth + 1); @@ -510,7 +439,7 @@ void E_(PlaylistListNode)( intf_thread_t *p_intf, playlist_t *p_pl, /**************************************************************************** * Seek command parsing handling ****************************************************************************/ -void E_(HandleSeek)( intf_thread_t *p_intf, char *p_value ) +void HandleSeek( intf_thread_t *p_intf, char *p_value ) { intf_sys_t *p_sys = p_intf->p_sys; vlc_value_t val; @@ -702,7 +631,7 @@ void E_(HandleSeek)( intf_thread_t *p_intf, char *p_value ) /**************************************************************************** * URI Parsing functions ****************************************************************************/ -int E_(TestURIParam)( char *psz_uri, const char *psz_name ) +int TestURIParam( char *psz_uri, const char *psz_name ) { char *p = psz_uri; @@ -712,12 +641,12 @@ int E_(TestURIParam)( char *psz_uri, const char *psz_name ) if( (p == psz_uri || *(p - 1) == '&' || *(p - 1) == '\n') && p[strlen(psz_name)] == '=' ) { - return VLC_TRUE; + return true; } p++; } - return VLC_FALSE; + return false; } static char *FindURIValue( char *psz_uri, const char *restrict psz_name, @@ -765,7 +694,7 @@ static char *FindURIValue( char *psz_uri, const char *restrict psz_name, return p; } -char *E_(ExtractURIValue)( char *restrict psz_uri, +char *ExtractURIValue( char *restrict psz_uri, const char *restrict psz_name, char *restrict psz_buf, size_t bufsize ) { @@ -793,7 +722,7 @@ char *E_(ExtractURIValue)( char *restrict psz_uri, return psz_next; } -char *E_(ExtractURIString)( char *restrict psz_uri, +char *ExtractURIString( char *restrict psz_uri, const char *restrict psz_name ) { size_t len; @@ -815,9 +744,9 @@ char *E_(ExtractURIString)( char *restrict psz_uri, /* Since the resulting string is smaller we can work in place, so it is * permitted to have psz == new. new points to the first word of the * string, the function returns the remaining string. */ -char *E_(FirstWord)( char *psz, char *new ) +char *FirstWord( char *psz, char *new ) { - vlc_bool_t b_end; + bool b_end; while( *psz == ' ' ) psz++; @@ -862,7 +791,7 @@ char *E_(FirstWord)( char *psz, char *new ) * of space to delimit option boundaries. */ static char *FirstOption( char *psz, char *new ) { - vlc_bool_t b_end, b_start = VLC_TRUE; + bool b_end, b_start = true; while( *psz == ' ' ) psz++; @@ -877,7 +806,7 @@ static char *FirstOption( char *psz, char *new ) if( *psz == '\\' && psz[1] != '\0' ) psz++; *new++ = *psz++; - b_start = VLC_FALSE; + b_start = false; } if( *psz == c ) psz++; @@ -887,7 +816,7 @@ static char *FirstOption( char *psz, char *new ) if( *psz == '\\' && psz[1] != '\0' ) psz++; *new++ = *psz++; - b_start = VLC_FALSE; + b_start = false; } } b_end = !*psz; @@ -903,7 +832,7 @@ static char *FirstOption( char *psz, char *new ) return NULL; } -input_item_t *E_(MRLParse)( intf_thread_t *p_intf, char *_psz, +input_item_t *MRLParse( intf_thread_t *p_intf, char *_psz, char *psz_name ) { char *psz = strdup( _psz ); @@ -942,7 +871,7 @@ input_item_t *E_(MRLParse)( intf_thread_t *p_intf, char *_psz, /********************************************************************** * RealPath: parse ../, ~ and path stuff **********************************************************************/ -char *E_(RealPath)( intf_thread_t *p_intf, const char *psz_src ) +char *RealPath( const char *psz_src ) { char *psz_dir; char *p; @@ -981,8 +910,7 @@ char *E_(RealPath)( intf_thread_t *p_intf, const char *psz_src ) if( psz_dir[0] == '~' ) { char *dir; - /* This is incomplete : we should also support the ~cmassiot/ syntax. */ - asprintf( &dir, "%s%s", p_intf->p_libvlc->psz_userdir, psz_dir + 1 ); + asprintf( &dir, "%s%s", config_GetHomeDir(), psz_dir + 1 ); free( psz_dir ); psz_dir = dir; }