* http.c : HTTP/HTTPS Remote control interface
*****************************************************************************
* Copyright (C) 2001-2006 the VideoLAN team
- * $Id$
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
* Laurent Aimar <fenrir@via.ecp.fr>
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
#include "http.h"
+#include <vlc_plugin.h>
+
+#include <assert.h>
/*****************************************************************************
* Module descriptor
"machine, enter 127.0.0.1" )
#define SRC_TEXT N_( "Source directory" )
#define SRC_LONGTEXT N_( "Source directory" )
-#define CHARSET_TEXT N_( "Charset" )
-#define CHARSET_LONGTEXT N_( \
- "Charset declared in Content-Type header (default UTF-8)." )
#define HANDLERS_TEXT N_( "Handlers" )
#define HANDLERS_LONGTEXT N_( \
"List of handler extensions and executable paths (for instance: " \
#define CRL_TEXT N_( "CRL file" )
#define CRL_LONGTEXT N_( "HTTP interace Certificates Revocation List file." )
-vlc_module_begin();
- set_shortname( _("HTTP"));
- set_description( _("HTTP remote control interface") );
- set_category( CAT_INTERFACE );
- set_subcategory( SUBCAT_INTERFACE_MAIN );
- add_string ( "http-host", NULL, NULL, HOST_TEXT, HOST_LONGTEXT, VLC_TRUE );
- add_string ( "http-src", NULL, NULL, SRC_TEXT, SRC_LONGTEXT, VLC_TRUE );
- add_string ( "http-charset", "UTF-8", NULL, CHARSET_TEXT, CHARSET_LONGTEXT, VLC_TRUE );
+vlc_module_begin ()
+ set_shortname( N_("HTTP"))
+ set_description( N_("HTTP remote control interface") )
+ set_category( CAT_INTERFACE )
+ set_subcategory( SUBCAT_INTERFACE_MAIN )
+ add_string ( "http-host", NULL, NULL, HOST_TEXT, HOST_LONGTEXT, true )
+ add_string ( "http-src", NULL, NULL, SRC_TEXT, SRC_LONGTEXT, true )
+ add_obsolete_string ( "http-charset" )
#if defined( HAVE_FORK ) || defined( WIN32 )
- add_string ( "http-handlers", NULL, NULL, HANDLERS_TEXT, HANDLERS_LONGTEXT, VLC_TRUE );
+ add_string ( "http-handlers", NULL, NULL, HANDLERS_TEXT, HANDLERS_LONGTEXT, true )
#endif
- add_bool ( "http-album-art", VLC_FALSE, NULL, ART_TEXT, ART_LONGTEXT, VLC_TRUE );
- set_section( N_("HTTP SSL" ), 0 );
- add_string ( "http-intf-cert", NULL, NULL, CERT_TEXT, CERT_LONGTEXT, VLC_TRUE );
- add_string ( "http-intf-key", NULL, NULL, KEY_TEXT, KEY_LONGTEXT, VLC_TRUE );
- add_string ( "http-intf-ca", NULL, NULL, CA_TEXT, CA_LONGTEXT, VLC_TRUE );
- add_string ( "http-intf-crl", NULL, NULL, CRL_TEXT, CRL_LONGTEXT, VLC_TRUE );
- set_capability( "interface", 0 );
- set_callbacks( Open, Close );
-vlc_module_end();
+ add_bool ( "http-album-art", false, NULL, ART_TEXT, ART_LONGTEXT, true )
+ set_section( N_("HTTP SSL" ), 0 )
+ add_string ( "http-intf-cert", NULL, NULL, CERT_TEXT, CERT_LONGTEXT, true )
+ add_string ( "http-intf-key", NULL, NULL, KEY_TEXT, KEY_LONGTEXT, true )
+ add_string ( "http-intf-ca", NULL, NULL, CA_TEXT, CA_LONGTEXT, true )
+ add_string ( "http-intf-crl", NULL, NULL, CRL_TEXT, CRL_LONGTEXT, true )
+ set_capability( "interface", 0 )
+ set_callbacks( Open, Close )
+vlc_module_end ()
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-static void Run ( intf_thread_t *p_intf );
-int E_(ArtCallback)( httpd_handler_sys_t *p_args,
+int ArtCallback( httpd_handler_sys_t *p_args,
httpd_handler_t *p_handler, char *_p_url,
uint8_t *_p_request, int i_type,
uint8_t *_p_in, int i_in,
char *psz_remote_addr, char *psz_remote_host,
uint8_t **pp_data, int *pi_data );
-/*****************************************************************************
- * Local functions
- *****************************************************************************/
-#if !defined(__APPLE__) && !defined(SYS_BEOS) && !defined(WIN32)
-static int DirectoryCheck( const char *psz_dir )
-{
- DIR *p_dir;
-
-#ifdef HAVE_SYS_STAT_H
- struct stat stat_info;
-
- 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 )
- {
- return VLC_EGENERIC;
- }
- closedir( p_dir );
-
- return VLC_SUCCESS;
-}
-#endif
-
-
/*****************************************************************************
* Activate: initialize and create stuff
*****************************************************************************/
intf_thread_t *p_intf = (intf_thread_t*)p_this;
intf_sys_t *p_sys;
char *psz_address;
- const char *psz_cert = NULL, *psz_key = NULL, *psz_ca = NULL,
+ char *psz_cert = NULL, *psz_key = NULL, *psz_ca = NULL,
*psz_crl = NULL;
int i_port = 0;
- char *psz_src;
+ char *psz_src = NULL;
- psz_address = var_GetNonEmptyString(p_intf->p_libvlc, "http-host");
+ psz_address = var_CreateGetNonEmptyString( p_intf, "http-host" );
if( psz_address != NULL )
{
- char *psz_parser = strchr( psz_address, ':' );
+ char *psz_parser = strrchr( psz_address, ':' );
if( psz_parser )
{
*psz_parser++ = '\0';
p_intf->p_sys = p_sys = malloc( sizeof( intf_sys_t ) );
if( !p_intf->p_sys )
{
+ free( psz_address );
return( VLC_ENOMEM );
}
- p_sys->p_playlist = NULL;
+
+ p_sys->p_playlist = pl_Hold( p_this );
p_sys->p_input = NULL;
p_sys->p_vlm = NULL;
p_sys->psz_address = psz_address;
p_sys->i_port = i_port;
p_sys->p_art_handler = NULL;
- /* determine Content-Type value for HTML pages */
- psz_src = config_GetPsz( p_intf, "http-charset" );
- if( psz_src == NULL || !*psz_src )
- {
- if( psz_src != NULL ) free( psz_src );
- psz_src = strdup("UTF-8");
- }
-
- p_sys->psz_html_type = malloc( 20 + strlen( psz_src ) );
- if( p_sys->psz_html_type == NULL )
- {
- free( p_sys->psz_address );
- free( p_sys );
- free( psz_src );
- return VLC_ENOMEM ;
- }
- sprintf( p_sys->psz_html_type, "text/html; charset=%s", psz_src );
- msg_Dbg( p_intf, "using charset=%s", psz_src );
-
- if( strcmp( psz_src, "UTF-8" ) )
- {
- char psz_encoding[strlen( psz_src ) + sizeof( "//translit")];
- sprintf( psz_encoding, "%s//translit", psz_src);
-
- p_sys->iconv_from_utf8 = vlc_iconv_open( psz_encoding, "UTF-8" );
- if( p_sys->iconv_from_utf8 == (vlc_iconv_t)-1 )
- msg_Warn( p_intf, "unable to perform charset conversion to %s",
- psz_encoding );
- else
- {
- p_sys->iconv_to_utf8 = vlc_iconv_open( "UTF-8", psz_src );
- if( p_sys->iconv_to_utf8 == (vlc_iconv_t)-1 )
- msg_Warn( p_intf,
- "unable to perform charset conversion from %s",
- psz_src );
- }
- }
- else
- {
- p_sys->iconv_from_utf8 = p_sys->iconv_to_utf8 = (vlc_iconv_t)-1;
- }
-
- p_sys->psz_charset = psz_src;
- psz_src = NULL;
-
/* determine file handler associations */
p_sys->i_handlers = 0;
p_sys->pp_handlers = NULL;
p_handler = malloc( sizeof( http_association_t ) );
p_handler->psz_ext = strdup( psz_ext );
- psz_options = E_(FirstWord)( psz_program, psz_program );
+ psz_options = FirstWord( psz_program, psz_program );
p_handler->i_argc = 0;
p_handler->ppsz_argv = NULL;
TAB_APPEND( p_handler->i_argc, p_handler->ppsz_argv,
strdup( psz_program ) );
while( psz_options != NULL && *psz_options )
{
- char *psz_next = E_(FirstWord)( psz_options, psz_options );
+ char *psz_next = FirstWord( psz_options, psz_options );
TAB_APPEND( p_handler->i_argc, p_handler->ppsz_argv,
strdup( psz_options ) );
psz_options = psz_next;
TAB_APPEND( p_sys->i_handlers, p_sys->pp_handlers, p_handler );
}
}
- if( psz_src != NULL )
- free( psz_src );
+ free( psz_src );
#endif
/* determine SSL configuration */
p_sys->p_httpd_host = httpd_TLSHostNew( VLC_OBJECT(p_intf), psz_address,
i_port, psz_cert, psz_key, psz_ca,
psz_crl );
+ free( psz_cert );
+ free( psz_key );
+ free( psz_ca );
+ free( psz_crl );
+
if( p_sys->p_httpd_host == NULL )
{
msg_Err( p_intf, "cannot listen on %s:%d", psz_address, i_port );
- free( p_sys->psz_html_type );
+ pl_Release( p_this );
free( p_sys->psz_address );
free( p_sys );
return VLC_EGENERIC;
p_sys->i_files = 0;
p_sys->pp_files = NULL;
-#if defined(__APPLE__) || defined(SYS_BEOS) || defined(WIN32)
- if ( ( psz_src = config_GetPsz( p_intf, "http-src" )) == NULL )
- {
- const char * psz_vlcpath = config_GetDataDir();
- psz_src = malloc( strlen(psz_vlcpath) + strlen("/http" ) + 1 );
- if( !psz_src ) return VLC_ENOMEM;
- sprintf( psz_src, "%s/http", psz_vlcpath );
- }
-#else
psz_src = config_GetPsz( p_intf, "http-src" );
-
if( ( psz_src == NULL ) || ( *psz_src == '\0' ) )
{
- static char const* ppsz_paths[] = {
- "share/http",
- "../share/http",
- DATA_PATH"/http",
- NULL
- };
- unsigned i;
-
- if( psz_src != NULL )
- {
- free( psz_src );
+ const char *data_path = config_GetDataDir ();
+ if( asprintf( &psz_src, "%s" DIR_SEP "http", data_path ) == -1 )
psz_src = NULL;
- }
-
- for( i = 0; ppsz_paths[i] != NULL; i++ )
- if( !DirectoryCheck( ppsz_paths[i] ) )
- {
- psz_src = strdup( ppsz_paths[i] );
- break;
- }
}
-#endif
if( !psz_src || *psz_src == '\0' )
{
psz_src[strlen( psz_src ) - 1] = '\0';
}
- E_(ParseDirectory)( p_intf, psz_src, psz_src );
+ ParseDirectory( p_intf, psz_src, psz_src );
if( p_sys->i_files <= 0 )
{
msg_Err( p_intf, "cannot find any file in directory %s", psz_src );
goto failed;
}
- p_intf->pf_run = Run;
free( psz_src );
if( config_GetInt( p_intf, "http-album-art" ) )
/* FIXME: we're leaking h */
httpd_handler_sys_t *h = malloc( sizeof( httpd_handler_sys_t ) );
if( !h )
- {
- msg_Err( p_intf, "not enough memory to allocate album art handler" );
goto failed;
- }
h->file.p_intf = p_intf;
h->file.file = NULL;
h->file.name = NULL;
/* TODO: use ACL and login/password stuff here too */
h->p_handler = httpd_HandlerNew( p_sys->p_httpd_host,
"/art", NULL, NULL, NULL,
- E_(ArtCallback), h );
+ ArtCallback, h );
p_sys->p_art_handler = h->p_handler;
}
free( p_sys->pp_files );
httpd_HostDelete( p_sys->p_httpd_host );
free( p_sys->psz_address );
- free( p_sys->psz_html_type );
- if( p_sys->iconv_from_utf8 != (vlc_iconv_t)-1 )
- vlc_iconv_close( p_sys->iconv_from_utf8 );
- if( p_sys->iconv_to_utf8 != (vlc_iconv_t)-1 )
- vlc_iconv_close( p_sys->iconv_to_utf8 );
free( p_sys );
+ pl_Release( p_this );
return VLC_EGENERIC;
}
{
intf_thread_t *p_intf = (intf_thread_t *)p_this;
intf_sys_t *p_sys = p_intf->p_sys;
-
int i;
+#ifdef ENABLE_VLM
if( p_sys->p_vlm )
- {
vlm_Delete( p_sys->p_vlm );
- }
+#endif
for( i = 0; i < p_sys->i_files; i++ )
{
if( p_sys->pp_files[i]->b_handler )
free( p_sys->pp_files[i]->name );
free( p_sys->pp_files[i] );
}
- if( p_sys->pp_files )
- {
- free( p_sys->pp_files );
- }
+ free( p_sys->pp_files );
for( i = 0; i < p_sys->i_handlers; i++ )
{
http_association_t *p_handler = p_sys->pp_handlers[i];
httpd_HandlerDelete( p_sys->p_art_handler );
httpd_HostDelete( p_sys->p_httpd_host );
free( p_sys->psz_address );
- free( p_sys->psz_html_type );
-
- if( p_sys->iconv_from_utf8 != (vlc_iconv_t)-1 )
- vlc_iconv_close( p_sys->iconv_from_utf8 );
- if( p_sys->iconv_to_utf8 != (vlc_iconv_t)-1 )
- vlc_iconv_close( p_sys->iconv_to_utf8 );
free( p_sys );
-}
-
-/*****************************************************************************
- * Run: http interface thread
- *****************************************************************************/
-static void Run( intf_thread_t *p_intf )
-{
- intf_sys_t *p_sys = p_intf->p_sys;
-
- while( !intf_ShouldDie( p_intf ) )
- {
- /* get the playlist */
- if( p_sys->p_playlist == NULL )
- {
- p_sys->p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
- }
-
- /* Manage the input part */
- if( p_sys->p_input == NULL )
- {
- if( p_sys->p_playlist )
- {
- p_sys->p_input = p_sys->p_playlist->p_input;
- }
- }
- else if( p_sys->p_input->b_dead || p_sys->p_input->b_die )
- {
- p_sys->p_input = NULL;
- }
-
-
- /* Wait a bit */
- msleep( INTF_IDLE_SLEEP );
- }
-
- if( p_sys->p_input )
- {
- vlc_object_release( p_sys->p_input );
- p_sys->p_input = NULL;
- }
-
- if( p_sys->p_playlist )
- {
- vlc_object_release( p_sys->p_playlist );
- p_sys->p_playlist = NULL;
- }
+ pl_Release( p_this );
}
/****************************************************************************
int i_buffer, char *p_request,
char **pp_data, int *pi_data )
{
+ intf_sys_t *p_sys = p_args->p_intf->p_sys;
int i_request = p_request != NULL ? strlen( p_request ) : 0;
char *dst;
vlc_value_t val;
const char *state;
char stats[20];
-#define p_sys p_args->p_intf->p_sys
+ assert( p_sys->p_input == NULL );
+ /* FIXME: proper locking anyone? */
+ p_sys->p_input = playlist_CurrentInput( p_sys->p_playlist );
if( p_sys->p_input )
{
var_Get( p_sys->p_input, "position", &val);
sprintf( position, "%d" , (int)((val.f_float) * 100.0));
var_Get( p_sys->p_input, "time", &val);
- sprintf( time, I64Fi, (int64_t)val.i_time / I64C(1000000) );
+ sprintf( time, "%"PRIi64, (int64_t)val.i_time / INT64_C(1000000) );
var_Get( p_sys->p_input, "length", &val);
- sprintf( length, I64Fi, (int64_t)val.i_time / I64C(1000000) );
+ sprintf( length, "%"PRIi64, (int64_t)val.i_time / INT64_C(1000000) );
var_Get( p_sys->p_input, "state", &val );
if( val.i_int == PLAYING_S )
{
state = "opening/connecting";
}
- else if( val.i_int == BUFFERING_S )
- {
- state = "buffering";
- }
else if( val.i_int == PAUSE_S )
{
state = "paused";
sprintf( length, "%d", 0 );
state = "stop";
}
-#undef p_sys
aout_VolumeGet( p_args->p_intf, &i_volume );
sprintf( volume, "%d", (int)i_volume );
- p_args->vars = E_(mvar_New)( "variables", "" );
- E_(mvar_AppendNewVar)( p_args->vars, "url_param",
+ p_args->vars = mvar_New( "variables", "" );
+ mvar_AppendNewVar( p_args->vars, "url_param",
i_request > 0 ? "1" : "0" );
- E_(mvar_AppendNewVar)( p_args->vars, "url_value", p_request );
- E_(mvar_AppendNewVar)( p_args->vars, "version", VLC_Version() );
- E_(mvar_AppendNewVar)( p_args->vars, "copyright", COPYRIGHT_MESSAGE );
- E_(mvar_AppendNewVar)( p_args->vars, "vlc_compile_by", VLC_CompileBy() );
- E_(mvar_AppendNewVar)( p_args->vars, "vlc_compile_host",
+ mvar_AppendNewVar( p_args->vars, "url_value", p_request );
+ mvar_AppendNewVar( p_args->vars, "version", VLC_Version() );
+ mvar_AppendNewVar( p_args->vars, "copyright", COPYRIGHT_MESSAGE );
+ mvar_AppendNewVar( p_args->vars, "vlc_compile_by", VLC_CompileBy() );
+ mvar_AppendNewVar( p_args->vars, "vlc_compile_host",
VLC_CompileHost() );
- E_(mvar_AppendNewVar)( p_args->vars, "vlc_compile_domain",
+ mvar_AppendNewVar( p_args->vars, "vlc_compile_domain",
VLC_CompileDomain() );
- E_(mvar_AppendNewVar)( p_args->vars, "vlc_compiler", VLC_Compiler() );
- E_(mvar_AppendNewVar)( p_args->vars, "vlc_changeset", VLC_Changeset() );
- E_(mvar_AppendNewVar)( p_args->vars, "stream_position", position );
- E_(mvar_AppendNewVar)( p_args->vars, "stream_time", time );
- E_(mvar_AppendNewVar)( p_args->vars, "stream_length", length );
- E_(mvar_AppendNewVar)( p_args->vars, "volume", volume );
- E_(mvar_AppendNewVar)( p_args->vars, "stream_state", state );
- E_(mvar_AppendNewVar)( p_args->vars, "charset", ((intf_sys_t *)p_args->p_intf->p_sys)->psz_charset );
+ mvar_AppendNewVar( p_args->vars, "vlc_compiler", VLC_Compiler() );
+ mvar_AppendNewVar( p_args->vars, "vlc_changeset", VLC_Changeset() );
+ mvar_AppendNewVar( p_args->vars, "stream_position", position );
+ mvar_AppendNewVar( p_args->vars, "stream_time", time );
+ mvar_AppendNewVar( p_args->vars, "stream_length", length );
+ mvar_AppendNewVar( p_args->vars, "volume", volume );
+ mvar_AppendNewVar( p_args->vars, "stream_state", state );
+ mvar_AppendNewVar( p_args->vars, "charset", "UTF-8" );
/* Stats */
-#define p_sys p_args->p_intf->p_sys
if( p_sys->p_input )
{
/* FIXME: Workarround a stupid assert in input_GetItem */
{
vlc_mutex_lock( &p_item->p_stats->lock );
#define STATS_INT( n ) sprintf( stats, "%d", p_item->p_stats->i_ ## n ); \
- E_(mvar_AppendNewVar)( p_args->vars, #n, stats );
+ mvar_AppendNewVar( p_args->vars, #n, stats );
#define STATS_FLOAT( n ) sprintf( stats, "%f", p_item->p_stats->f_ ## n ); \
- E_(mvar_AppendNewVar)( p_args->vars, #n, stats );
+ mvar_AppendNewVar( p_args->vars, #n, stats );
STATS_INT( read_bytes )
STATS_FLOAT( input_bitrate )
STATS_INT( demux_read_bytes )
vlc_mutex_unlock( &p_item->p_stats->lock );
}
}
-#undef p_sys
- E_(SSInit)( &p_args->stack );
+ SSInit( &p_args->stack );
/* allocate output */
*pi_data = i_buffer + 1000;
dst = *pp_data = malloc( *pi_data );
/* we parse executing all <vlc /> macros */
- E_(Execute)( p_args, p_request, i_request, pp_data, pi_data, &dst,
+ Execute( p_args, p_request, i_request, pp_data, pi_data, &dst,
&p_buffer[0], &p_buffer[i_buffer] );
*dst = '\0';
*pi_data = dst - *pp_data;
- E_(SSClean)( &p_args->stack );
- E_(mvar_Delete)( p_args->vars );
+ if( p_sys->p_input != NULL )
+ {
+ vlc_object_release( p_sys->p_input );
+ p_sys->p_input = NULL;
+ }
+ SSClean( &p_args->stack );
+ mvar_Delete( p_args->vars );
}
-int E_(HttpCallback)( httpd_file_sys_t *p_args,
+int HttpCallback( httpd_file_sys_t *p_args,
httpd_file_t *p_file,
uint8_t *_p_request,
uint8_t **_pp_data, int *pi_data )
{
+ VLC_UNUSED(p_file);
char *p_request = (char *)_p_request;
char **pp_data = (char **)_pp_data;
FILE *f;
if( !p_args->b_html )
{
- E_(FileLoad)( f, pp_data, pi_data );
+ FileLoad( f, pp_data, pi_data );
}
else
{
char *p_buffer;
/* first we load in a temporary buffer */
- E_(FileLoad)( f, &p_buffer, &i_buffer );
+ FileLoad( f, &p_buffer, &i_buffer );
ParseExecute( p_args, p_buffer, i_buffer, p_request, pp_data, pi_data );
****************************************************************************
* call the external handler and parse vlc macros if Content-Type is HTML
****************************************************************************/
-int E_(HandlerCallback)( httpd_handler_sys_t *p_args,
+int HandlerCallback( httpd_handler_sys_t *p_args,
httpd_handler_t *p_handler, char *_p_url,
uint8_t *_p_request, int i_type,
uint8_t *_p_in, int i_in,
char *psz_remote_addr, char *psz_remote_host,
uint8_t **_pp_data, int *pi_data )
{
+ VLC_UNUSED(p_handler); VLC_UNUSED(_p_in);
char *p_url = (char *)_p_url;
char *p_request = (char *)_p_request;
char **pp_data = (char **)_pp_data;
- char *p_in = (char *)p_in;
+ char *p_in = (char *)_p_in;
int i_request = p_request != NULL ? strlen( p_request ) : 0;
char *p;
int i_env = 0;
if( i_request )
{
- psz_tmp = malloc( sizeof("QUERY_STRING=") + i_request );
- sprintf( psz_tmp, "QUERY_STRING=%s", p_request );
+ asprintf( &psz_tmp, "QUERY_STRING=%s", p_request );
TAB_APPEND( i_env, ppsz_env, psz_tmp );
- psz_tmp = malloc( sizeof("REQUEST_URI=?") + strlen(p_url)
- + i_request );
- sprintf( psz_tmp, "REQUEST_URI=%s?%s", p_url, p_request );
+ asprintf( &psz_tmp, "REQUEST_URI=%s?%s", p_url, p_request );
TAB_APPEND( i_env, ppsz_env, psz_tmp );
}
else
{
- psz_tmp = malloc( sizeof("REQUEST_URI=") + strlen(p_url) );
- sprintf( psz_tmp, "REQUEST_URI=%s", p_url );
+ asprintf( &psz_tmp, "REQUEST_URI=%s", p_url );
TAB_APPEND( i_env, ppsz_env, psz_tmp );
}
- psz_tmp = malloc( sizeof("SCRIPT_NAME=") + strlen(p_url) );
- sprintf( psz_tmp, "SCRIPT_NAME=%s", p_url );
+ asprintf( &psz_tmp, "SCRIPT_NAME=%s", p_url );
TAB_APPEND( i_env, ppsz_env, psz_tmp );
#define p_sys p_args->file.p_intf->p_sys
- psz_tmp = malloc( sizeof("SERVER_NAME=") + strlen(p_sys->psz_address) );
- sprintf( psz_tmp, "SERVER_NAME=%s", p_sys->psz_address );
+ asprintf( &psz_tmp, "SERVER_NAME=%s", p_sys->psz_address );
TAB_APPEND( i_env, ppsz_env, psz_tmp );
- psz_tmp = malloc( sizeof("SERVER_PORT=") + 5 );
- sprintf( psz_tmp, "SERVER_PORT=%u", p_sys->i_port );
+ asprintf( &psz_tmp, "SERVER_PORT=%u", p_sys->i_port );
TAB_APPEND( i_env, ppsz_env, psz_tmp );
#undef p_sys
p = getenv( "PATH" );
if( p != NULL )
{
- psz_tmp = malloc( sizeof("PATH=") + strlen(p) );
- sprintf( psz_tmp, "PATH=%s", p );
+ asprintf( &psz_tmp, "PATH=%s", p );
TAB_APPEND( i_env, ppsz_env, psz_tmp );
}
p = getenv( "windir" );
if( p != NULL )
{
- psz_tmp = malloc( sizeof("SYSTEMROOT=") + strlen(p) );
- sprintf( psz_tmp, "SYSTEMROOT=%s", p );
+ asprintf( &psz_tmp, "SYSTEMROOT=%s", p );
TAB_APPEND( i_env, ppsz_env, psz_tmp );
}
#endif
if( psz_remote_addr != NULL && *psz_remote_addr )
{
- psz_tmp = malloc( sizeof("REMOTE_ADDR=") + strlen(psz_remote_addr) );
- sprintf( psz_tmp, "REMOTE_ADDR=%s", psz_remote_addr );
+ asprintf( &psz_tmp, "REMOTE_ADDR=%s", psz_remote_addr );
TAB_APPEND( i_env, ppsz_env, psz_tmp );
}
if( psz_remote_host != NULL && *psz_remote_host )
{
- psz_tmp = malloc( sizeof("REMOTE_HOST=") + strlen(psz_remote_host) );
- sprintf( psz_tmp, "REMOTE_HOST=%s", psz_remote_host );
+ asprintf( &psz_tmp, "REMOTE_HOST=%s", psz_remote_host );
TAB_APPEND( i_env, ppsz_env, psz_tmp );
}
if( end == NULL )
break;
*end = '\0';
- psz_tmp = malloc( sizeof("CONTENT_TYPE=") + strlen(p) );
- sprintf( psz_tmp, "CONTENT_TYPE=%s", p );
+ asprintf( &psz_tmp, "CONTENT_TYPE=%s", p );
TAB_APPEND( i_env, ppsz_env, psz_tmp );
*end = '\r';
}
if( end == NULL )
break;
*end = '\0';
- psz_tmp = malloc( sizeof("CONTENT_LENGTH=") + strlen(p) );
- sprintf( psz_tmp, "CONTENT_LENGTH=%s", p );
+ asprintf( &psz_tmp, "CONTENT_LENGTH=%s", p );
TAB_APPEND( i_env, ppsz_env, psz_tmp );
*end = '\r';
}
if( psz_file != NULL )
{
psz_file++;
- psz_tmp = malloc( sizeof("SCRIPT_FILENAME=") + strlen(psz_file) );
- sprintf( psz_tmp, "SCRIPT_FILENAME=%s", psz_file );
+ asprintf( &psz_tmp, "SCRIPT_FILENAME=%s", psz_file );
TAB_APPEND( i_env, ppsz_env, psz_tmp );
TAB_APPEND( p_args->p_association->i_argc,
NULL );
TAB_REMOVE( p_args->p_association->i_argc, p_args->p_association->ppsz_argv,
psz_file );
- if( psz_cwd != NULL )
- free( psz_cwd );
+ free( psz_cwd );
while( i_env )
TAB_REMOVE( i_env, ppsz_env, ppsz_env[0] );
return VLC_SUCCESS;
}
-int E_(ArtCallback)( httpd_handler_sys_t *p_args,
+int ArtCallback( httpd_handler_sys_t *p_args,
httpd_handler_t *p_handler, char *_p_url,
uint8_t *p_request, int i_type,
uint8_t *p_in, int i_in,
char *psz_remote_addr, char *psz_remote_host,
uint8_t **pp_data, int *pi_data )
{
+ VLC_UNUSED(p_handler); VLC_UNUSED(_p_url); VLC_UNUSED(i_type);
+ VLC_UNUSED(p_in); VLC_UNUSED(i_in); VLC_UNUSED(psz_remote_addr);
+ VLC_UNUSED(psz_remote_host);
+
char *psz_art = NULL;
intf_thread_t *p_intf = p_args->file.p_intf;
intf_sys_t *p_sys = p_intf->p_sys;
psz_id[0] = '\0';
if( p_request )
- E_(ExtractURIValue)( (char *)p_request, "id", psz_id, 15 );
+ ExtractURIValue( (char *)p_request, "id", psz_id, 15 );
i_id = atoi( psz_id );
if( i_id )
{
playlist_item_t *p_pl_item = playlist_ItemGetById( p_sys->p_playlist,
- i_id, VLC_FALSE );
+ i_id, false );
if( p_pl_item )
p_item = p_pl_item->p_input;
}
return VLC_SUCCESS;
}
- E_(FileLoad)( f, &p_data, &i_data );
+ FileLoad( f, &p_data, &i_data );
fclose( f );