remove buggy and inconsistent intf-switch

[vlc] / modules / access_output / http.c

diff --git a/modules/access_output/http.c b/modules/access_output/http.c
index 9c1c44350f54758595ecec17d7a63db8fa4009a8..a04f87aaa5f212a4aa5fe030f3b3e7c218b3b03c 100644 (file)
--- a/modules/access_output/http.c
+++ b/modules/access_output/http.c
@@ -26,12 +26,14 @@
  * Preamble
  *****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
 #include <vlc_sout.h>
 #include <vlc_block.h>
 
-#include <stdlib.h>
-#include <stdio.h>
 
 #include <vlc_input.h>
 #include <vlc_playlist.h>
@@ -65,12 +67,9 @@ static void Close( vlc_object_t * );
 #define PASS_TEXT N_("Password")
 #define PASS_LONGTEXT N_("Password that will be " \
                          "requested to access the stream." )
-
-/// \bug [String] missing closing parenthesis
 #define MIME_TEXT N_("Mime")
 #define MIME_LONGTEXT N_("MIME returned by the server (autodetected " \
-                        "if not specified." )
-
+                        "if not specified)." )
 #define CERT_TEXT N_( "Certificate file" )
 #define CERT_LONGTEXT N_( "Path to the x509 PEM certificate file that will "\
                           "be used for HTTPS." )
@@ -127,7 +126,7 @@ static const char *ppsz_sout_options[] = {
     "user", "pwd", "mime", "cert", "key", "ca", "crl", NULL
 };
 
-static int Write( sout_access_out_t *, block_t * );
+static ssize_t Write( sout_access_out_t *, block_t * );
 static int Seek ( sout_access_out_t *, off_t  );
 
 struct sout_access_out_sys_t
@@ -178,8 +177,8 @@ static int Open( vlc_object_t *p_this )
 
     config_ChainParse( p_access, SOUT_CFG_PREFIX, ppsz_sout_options, p_access->p_cfg );
 
-    /* p_access->psz_name = "hostname:port/filename" */
-    psz_bind_addr = psz_parser = strdup( p_access->psz_name );
+    /* p_access->psz_path = "hostname:port/filename" */
+    psz_bind_addr = psz_parser = strdup( p_access->psz_path );
 
     i_bind_port = 0;
     psz_file_name = NULL;
@@ -283,9 +282,9 @@ static int Open( vlc_object_t *p_this )
     p_sys->p_httpd_stream =
         httpd_StreamNew( p_sys->p_httpd_host, psz_file_name, psz_mime,
                          psz_user, psz_pwd, NULL );
-    if( psz_user ) free( psz_user );
-    if( psz_pwd ) free( psz_pwd );
-    if( psz_mime ) free( psz_mime );
+    free( psz_user );
+    free( psz_pwd );
+    free( psz_mime );
 
     if( p_sys->p_httpd_stream == NULL )
     {
@@ -303,22 +302,30 @@ static int Open( vlc_object_t *p_this )
         char                *psz_txt, *psz_name;
         playlist_t          *p_playlist = pl_Yield( p_access );
 
-        psz_name = strrchr( p_playlist->status.p_item->p_input->psz_uri,
-                            DIRECTORY_SEPARATOR );
+        char *psz_uri = input_item_GetURI( p_playlist->status.p_item->p_input );
+        char *psz_newuri = psz_uri;
+        psz_name = strrchr( psz_newuri, DIRECTORY_SEPARATOR );
         if( psz_name != NULL ) psz_name++;
-        else psz_name = p_playlist->status.p_item->p_input->psz_uri;
+        else psz_name = psz_newuri;
 
-        asprintf( &psz_txt, "path=%s", psz_file_name );
+        if( psz_file_name &&
+            asprintf( &psz_txt, "path=%s", psz_file_name ) == -1 )
+            {
+                pl_Release( p_playlist );
+                free( psz_uri );
+                return VLC_ENOMEM;
+            }
 
         p_sys->p_bonjour = bonjour_start_service( (vlc_object_t *)p_access,
                                     strcmp( p_access->psz_access, "https" )
                                        ? "_vlc-http._tcp" : "_vlc-https._tcp",
                                              psz_name, i_bind_port, psz_txt );
+        free( psz_uri );
         free( (void *)psz_txt );
 
         if( p_sys->p_bonjour == NULL )
             msg_Err( p_access, "unable to start requested Bonjour announce" );
-        vlc_object_release( p_playlist );
+        pl_Release( p_playlist );
     }
     else
         p_sys->p_bonjour = NULL;
@@ -360,7 +367,7 @@ static void Close( vlc_object_t * p_this )
     httpd_StreamDelete( p_sys->p_httpd_stream );
     httpd_HostDelete( p_sys->p_httpd_host );
 
-    FREE( p_sys->p_header );
+    free( p_sys->p_header );
 
     msg_Dbg( p_access, "Close" );
 
@@ -370,10 +377,11 @@ static void Close( vlc_object_t * p_this )
 /*****************************************************************************
  * Write:
  *****************************************************************************/
-static int Write( sout_access_out_t *p_access, block_t *p_buffer )
+static ssize_t Write( sout_access_out_t *p_access, block_t *p_buffer )
 {
     sout_access_out_sys_t *p_sys = p_access->p_sys;
     int i_err = 0;
+    int i_len = 0;
 
     while( p_buffer )
     {
@@ -409,6 +417,7 @@ static int Write( sout_access_out_t *p_access, block_t *p_buffer )
                                 p_sys->i_header_size );
         }
 
+        i_len += p_buffer->i_buffer;
         /* send data */
         i_err = httpd_StreamSend( p_sys->p_httpd_stream, p_buffer->p_buffer,
                                   p_buffer->i_buffer );
@@ -428,7 +437,7 @@ static int Write( sout_access_out_t *p_access, block_t *p_buffer )
         block_ChainRelease( p_buffer );
     }
 
-    return( i_err < 0 ? VLC_EGENERIC : VLC_SUCCESS );
+    return( i_err < 0 ? VLC_EGENERIC : i_len );
 }
 
 /*****************************************************************************