#include <vlc_common.h>
#include "http.h"
-#include "vlc_strings.h"
+#include <vlc_strings.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <vlc_fs.h>
/****************************************************************************
* File and directory functions
****************************************************************************/
/* ToUrl: create a good name for an url from filename */
-char *FileToUrl( char *name, bool *pb_index )
+static char *FileToUrl( const char *name, bool *pb_index )
{
- char *url, *p;
-
- url = p = malloc( strlen( name ) + 1 );
-
*pb_index = false;
- if( !url || !p )
- {
+
+ char *url = malloc( strlen( name ) + 2 );
+ if( unlikely(url == NULL) )
return NULL;
- }
-#ifdef WIN32
- while( *name == '\\' || *name == '/' )
+#if (DIR_SEP_CHAR == '/')
+ name += strspn( name, "/" );
#else
- while( *name == '/' )
+ name += strspn( name, "/"DIR_SEP );
#endif
- {
- name++;
- }
-
- *p++ = '/';
- strcpy( p, name );
+ *url = '/';
+ strcpy( url + 1, name );
-#ifdef WIN32
+#if (DIR_SEP_CHAR != '/')
/* convert '\\' into '/' */
- name = p;
- while( *name )
- {
- if( *name == '\\' )
- *name = '/';
- name++;
- }
+ for( char *ptr = url; *ptr; ptr++ )
+ if( *ptr == DIR_SEP_CHAR )
+ *ptr = '/';
#endif
/* index.* -> / */
- if( ( p = strrchr( url, '/' ) ) != NULL )
+ char *p = strrchr( url, '/' );
+ if( p != NULL && !strncmp( p, "/index.", 7 ) )
{
- if( !strncmp( p, "/index.", 7 ) )
- {
- p[1] = '\0';
- *pb_index = true;
- }
+ p[1] = '\0';
+ *pb_index = true;
}
return url;
}
/* just load the file */
*pi_data = 0;
- *pp_data = malloc( 1025 ); /* +1 for \0 */
+ *pp_data = xmalloc( 1025 ); /* +1 for \0 */
+
while( ( i_read = fread( &(*pp_data)[*pi_data], 1, 1024, f ) ) == 1024 )
{
*pi_data += 1024;
- *pp_data = realloc( *pp_data, *pi_data + 1025 );
+ *pp_data = xrealloc( *pp_data, *pi_data + 1025 );
}
if( i_read > 0 )
{
int i_dirlen;
- if( ( p_dir = utf8_opendir( psz_dir ) ) == NULL )
+ if( ( p_dir = vlc_opendir( psz_dir ) ) == NULL )
{
if( errno != ENOENT && errno != ENOTDIR )
msg_Err( p_intf, "cannot open directory (%s)", psz_dir );
msg_Dbg( p_intf, "dir=%s", psz_dir );
snprintf( dir, sizeof( dir ), "%s"DIR_SEP".access", psz_dir );
- if( ( file = utf8_fopen( dir, "r" ) ) != NULL )
+ if( ( file = vlc_fopen( dir, "r" ) ) != NULL )
{
char line[1024];
int i_size;
password = strdup( p );
}
}
- msg_Dbg( p_intf, "using user=%s password=%s (read=%d)",
- user, password, i_size );
+ msg_Dbg( p_intf, "using user=%s (read=%d)", user, i_size );
fclose( file );
}
ACL_Destroy( p_acl );
struct stat st;
- if( stat( dir, &st ) == 0 )
+ if( vlc_stat( dir, &st ) == 0 )
{
+ free( user );
+ free( password );
closedir( p_dir );
return VLC_EGENERIC;
}
{
char *psz_filename;
/* parse psz_src dir */
- if( ( psz_filename = utf8_readdir( p_dir ) ) == NULL )
+ if( ( psz_filename = vlc_readdir( p_dir ) ) == NULL )
{
break;
}
}
if( f == NULL )
{
- f = malloc( sizeof( httpd_file_sys_t ) );
+ f = xmalloc( sizeof( httpd_file_sys_t ) );
f->b_handler = false;
}
mvar_AppendNewVar( itm, "uri", psz );
free( psz );
- sprintf( value, "Item");
- mvar_AppendNewVar( itm, "type", value );
+ mvar_AppendNewVar( itm, "type", "Item" );
sprintf( value, "%d", i_depth );
mvar_AppendNewVar( itm, "depth", value );
psz = input_item_GetTitle( p_node->p_input );
mvar_AppendNewVar( itm, "title", psz );
+ free( psz );
psz = input_item_GetArtist( p_node->p_input );
mvar_AppendNewVar( itm, "artist", psz );
+ free( psz );
psz = input_item_GetGenre( p_node->p_input );
mvar_AppendNewVar( itm, "genre", psz );
+ free( psz );
psz = input_item_GetCopyright( p_node->p_input );
mvar_AppendNewVar( itm, "copyright", psz );
+ free( psz );
psz = input_item_GetAlbum( p_node->p_input );
mvar_AppendNewVar( itm, "album", psz );
+ free( psz );
psz = input_item_GetTrackNum( p_node->p_input );
mvar_AppendNewVar( itm, "track", psz );
+ free( psz );
psz = input_item_GetDescription( p_node->p_input );
mvar_AppendNewVar( itm, "description", psz );
+ free( psz );
psz = input_item_GetRating( p_node->p_input );
mvar_AppendNewVar( itm, "rating", psz );
+ free( psz );
psz = input_item_GetDate( p_node->p_input );
mvar_AppendNewVar( itm, "date", psz );
+ free( psz );
psz = input_item_GetURL( p_node->p_input );
mvar_AppendNewVar( itm, "url", psz );
+ free( psz );
psz = input_item_GetLanguage( p_node->p_input );
mvar_AppendNewVar( itm, "language", psz );
+ free( psz );
psz = input_item_GetNowPlaying( p_node->p_input );
mvar_AppendNewVar( itm, "now_playing", psz );
+ free( psz );
psz = input_item_GetPublisher( p_node->p_input );
mvar_AppendNewVar( itm, "publisher", psz );
+ free( psz );
psz = input_item_GetEncodedBy( p_node->p_input );
mvar_AppendNewVar( itm, "encoded_by", psz );
+ free( psz );
psz = input_item_GetArtURL( p_node->p_input );
mvar_AppendNewVar( itm, "art_url", psz );
+ free( psz );
psz = input_item_GetTrackID( p_node->p_input );
mvar_AppendNewVar( itm, "track_id", psz );
+ free( psz );
mvar_AppendVar( s, itm );
}
mvar_AppendNewVar( itm, "name", p_node->p_input->psz_name );
mvar_AppendNewVar( itm, "uri", p_node->p_input->psz_name );
- sprintf( value, "Node" );
- mvar_AppendNewVar( itm, "type", value );
+ mvar_AppendNewVar( itm, "type", "Node" );
sprintf( value, "%d", p_node->i_id );
mvar_AppendNewVar( itm, "index", value );
char *p;
int i_len = strlen(psz_src);
- psz_dir = malloc( i_len + 2 );
+ psz_dir = xmalloc( i_len + 2 );
strcpy( psz_dir, psz_src );
/* Add a trailing sep to ease the .. step */
if( psz_dir[0] == '~' )
{
- char *dir;
- asprintf( &dir, "%s%s", config_GetHomeDir(), psz_dir + 1 );
- free( psz_dir );
- psz_dir = dir;
+ char *home = config_GetUserDir( VLC_HOME_DIR ), *dir;
+ if( asprintf( &dir, "%s%s", home, psz_dir + 1 ) != -1 )
+ {
+ free( psz_dir );
+ psz_dir = dir;
+ }
+ free( home );
}
if( strlen(psz_dir) > 2 )