#define CRL_TEXT N_( "CRL file" )
#define CRL_LONGTEXT N_( "HTTP interace Certificates Revocation List file." )
-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" );
+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, true );
+ add_string ( "http-handlers", NULL, NULL, HANDLERS_TEXT, HANDLERS_LONGTEXT, true )
#endif
- 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();
+ 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 ()
/*****************************************************************************
/* 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;
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,