* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
-#include <stdio.h>
#include "http.h"
#include "vlc_strings.h"
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];
fclose( file );
}
- sprintf( dir, "%s%c.hosts", psz_dir, sep );
+ snprintf( dir, sizeof( dir ), "%s%c.hosts", psz_dir, sep );
p_acl = ACL_Create( p_intf, VLC_FALSE );
if( ACL_LoadFile( p_acl, dir ) )
{
for( ;; )
{
- const char *psz_filename;
+ char *psz_filename;
/* parse psz_src dir */
if( ( psz_filename = utf8_readdir( p_dir ) ) == NULL )
{
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 );
- LocaleFree( 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 ) )
{
httpd_file_sys_t *f = NULL;
httpd_handler_sys_t *h = NULL;
vlc_bool_t b_index;
- char *psz_tmp, *psz_file, *psz_name, *psz_ext;
-
- psz_tmp = vlc_fix_readdir_charset( p_intf, dir );
- psz_file = E_(FromUTF8)( p_intf, psz_tmp );
- free( psz_tmp );
- psz_tmp = vlc_fix_readdir_charset( p_intf,
- &dir[strlen( psz_root )] );
- psz_name = E_(FileToUrl)( psz_tmp, &b_index );
- free( psz_tmp );
- psz_ext = strrchr( psz_file, '.' );
+ char *psz_name, *psz_ext;
+
+ psz_name = E_(FileToUrl)( &dir[strlen( psz_root )], &b_index );
+ psz_ext = strrchr( dir, '.' );
if( psz_ext != NULL )
{
int i;
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;
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;" );
}
}
- if( user )
- {
- free( user );
- }
- if( password )
- {
- free( password );
- }
+ free( user );
+ free( password );
ACL_Destroy( p_acl );
closedir( p_dir );
}
-/**************************************************************************
- * 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
*************************************************************************/
E_(mvar_AppendNewVar)( itm, "current", "0" );
}
- sprintf( value, "%d", p_node->p_input->i_id );
+ sprintf( value, "%d", p_node->i_id );
E_(mvar_AppendNewVar)( itm, "index", value );
- psz = E_(FromUTF8)( p_intf, p_node->p_input->psz_name );
+ psz = input_item_GetName( p_node->p_input );
E_(mvar_AppendNewVar)( itm, "name", psz );
free( psz );
- psz = E_(FromUTF8)( p_intf, p_node->p_input->psz_uri );
+ psz = input_item_GetURI( p_node->p_input );
E_(mvar_AppendNewVar)( itm, "uri", psz );
free( psz );
E_(mvar_AppendNewVar)( itm, "ro", "rw" );
}
- sprintf( value, "%ld", (long)p_node->p_input->i_duration );
+ sprintf( value, "%ld",
+ (long) input_item_GetDuration( p_node->p_input ) );
E_(mvar_AppendNewVar)( itm, "duration", value );
E_(mvar_AppendVar)( s, itm );
else
{
char value[512];
- char *psz;
int i_child;
mvar_t *itm = E_(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 );
+ E_(mvar_AppendNewVar)( itm, "name", p_node->p_input->psz_name );
+ E_(mvar_AppendNewVar)( itm, "uri", p_node->p_input->psz_name );
sprintf( value, "Node" );
E_(mvar_AppendNewVar)( itm, "type", value );
- sprintf( value, "%d", p_node->p_input->i_id );
+ sprintf( value, "%d", p_node->i_id );
E_(mvar_AppendNewVar)( itm, "index", value );
sprintf( value, "%d", p_node->i_children);
return VLC_FALSE;
}
-char *E_(ExtractURIValue)( char *psz_uri, const char *psz_name,
- char *psz_value, int i_value_max )
+
+static char *FindURIValue( char *psz_uri, const char *restrict psz_name,
+ size_t *restrict p_len )
{
- char *p = psz_uri;
+ char *p = psz_uri, *end;
+ size_t len;
while( (p = strstr( p, psz_name )) )
{
p++;
}
- if( p )
+ if( p == NULL )
{
- int i_len;
+ *p_len = 0;
+ return NULL;
+ }
- p += strlen( psz_name );
- if( *p == '=' ) p++;
+ p += strlen( psz_name );
+ if( *p == '=' ) p++;
- if( strchr( p, '&' ) )
- {
- i_len = strchr( p, '&' ) - p;
- }
- else
- {
- /* for POST method */
- if( strchr( p, '\n' ) )
- {
- i_len = strchr( p, '\n' ) - p;
- if( i_len && *(p+i_len-1) == '\r' ) i_len--;
- }
- else
- {
- i_len = strlen( p );
- }
- }
- i_len = __MIN( i_value_max - 1, i_len );
- if( i_len > 0 )
- {
- strncpy( psz_value, p, i_len );
- psz_value[i_len] = '\0';
- }
- else
- {
- strncpy( psz_value, "", i_value_max );
- }
- p += i_len;
+ if( ( end = strchr( p, '\n' ) ) != NULL )
+ {
+ /* POST method */
+ if( ( end > p ) && ( end[-1] == '\r' ) )
+ end--;
+
+ len = end - p;
}
else
{
- strncpy( psz_value, "", i_value_max );
+ /* GET method */
+ if( ( end = strchr( p, '&' ) ) != NULL )
+ len = end - p;
+ else
+ len = strlen( p );
}
+ *p_len = len;
return p;
}
+char *E_(ExtractURIValue)( char *restrict psz_uri,
+ const char *restrict psz_name,
+ char *restrict psz_buf, size_t bufsize )
+{
+ size_t len;
+ char *psz_value = FindURIValue( psz_uri, psz_name, &len );
+ char *psz_next;
+
+ if( psz_value == NULL )
+ {
+ if( bufsize > 0 )
+ *psz_buf = '\0';
+ return NULL;
+ }
+
+ psz_next = psz_value + len;
+
+ if( len >= bufsize )
+ len = bufsize - 1;
+
+ if( len > 0 )
+ strncpy( psz_buf, psz_value, len );
+ if( bufsize > 0 )
+ psz_buf[len] = '\0';
+
+ return psz_next;
+}
+
+char *E_(ExtractURIString)( char *restrict psz_uri,
+ const char *restrict psz_name )
+{
+ size_t len;
+ char *psz_value = FindURIValue( psz_uri, psz_name, &len );
+
+ if( psz_value == NULL )
+ return NULL;
+
+ char *res = malloc( len + 1 );
+ if( res == NULL )
+ return NULL;
+
+ memcpy( res, psz_value, len );
+ res[len] = '\0';
+
+ return res;
+}
+
/* 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. */
{
s_temp = s_mrl + strlen( s_mrl );
}
- vlc_input_item_AddOption( p_input, s_mrl );
+ input_ItemAddOption( p_input, s_mrl );
s_mrl = s_temp;
}
char *psz_dir;
char *p;
int i_len = strlen(psz_src);
- char sep;
-
-#if defined( WIN32 )
- sep = '\\';
-#else
- sep = '/';
-#endif
+ const char sep = DIR_SEP_CHAR;
psz_dir = malloc( i_len + 2 );
strcpy( psz_dir, psz_src );
psz_dir[i_len] = sep;
psz_dir[i_len + 1] = '\0';
-#ifdef WIN32
+#if (DIR_SEP_CHAR != '/')
/* Convert all / to native separator */
p = psz_dir;
while( (p = strchr( p, '/' )) != NULL )
}
#endif
+ /* FIXME: this could be O(N) rather than O(N²)... */
/* Remove multiple separators and /./ */
p = psz_dir;
while( (p = strchr( p, sep )) != NULL )
if( psz_dir[0] == '~' )
{
- char *dir = malloc( strlen(psz_dir)
- + strlen(p_intf->p_vlc->psz_userdir) );
+ char *dir;
/* This is incomplete : we should also support the ~cmassiot/ syntax. */
- sprintf( dir, "%s%s", p_intf->p_vlc->psz_userdir, psz_dir + 1 );
+ asprintf( &dir, "%s%s", p_intf->p_libvlc->psz_homedir, psz_dir + 1 );
free( psz_dir );
psz_dir = dir;
}
projects / vlc / blobdiff