Include vlc_plugin.h as needed

[vlc] / modules / access_output / file.c

diff --git a/modules/access_output/file.c b/modules/access_output/file.c
index 9404b46d21a42ca9a7af056ce3a8d68c03d53b23..5f76d36e1c2ffb04dcae8872c26fb653929cdcea 100644 (file)
--- a/modules/access_output/file.c
+++ b/modules/access_output/file.c
@@ -25,15 +25,22 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <string.h>
+#include <time.h>
 #include <fcntl.h>
 #include <errno.h>
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
-#include <vlc/sout.h>
+#include <vlc_plugin.h>
+#include <vlc_sout.h>
+#include <vlc_block.h>
+#include <vlc_charset.h>
+#include "vlc_strings.h"
 
 #ifdef HAVE_UNISTD_H
 #   include <unistd.h>
@@ -42,12 +49,6 @@
 #endif
 
 /* For those platforms that don't use these */
-#ifndef S_IRGRP
-#   define S_IRGRP 0
-#endif
-#ifndef S_IROTH
-#   define S_IROTH 0
-#endif
 #ifndef STDOUT_FILENO
 #   define STDOUT_FILENO 1
 #endif
@@ -68,14 +69,14 @@ static void Close( vlc_object_t * );
 
 vlc_module_begin();
     set_description( _("File stream output") );
-    set_shortname( N_("File" ));
+    set_shortname( _("File" ));
     set_capability( "sout access", 50 );
     set_category( CAT_SOUT );
     set_subcategory( SUBCAT_SOUT_ACO );
     add_shortcut( "file" );
     add_shortcut( "stream" );
     add_bool( SOUT_CFG_PREFIX "append", 0, NULL, APPEND_TEXT,APPEND_LONGTEXT,
-              VLC_TRUE );
+              true );
     set_callbacks( Open, Close );
 vlc_module_end();
 
@@ -87,9 +88,9 @@ static const char *ppsz_sout_options[] = {
     "append", 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  );
-static int Read ( sout_access_out_t *, block_t * );
+static ssize_t Read ( sout_access_out_t *, block_t * );
 
 struct sout_access_out_sys_t
 {
@@ -105,31 +106,25 @@ static int Open( vlc_object_t *p_this )
     int                 i_flags;
     vlc_value_t         val;
 
-    sout_CfgParse( p_access, SOUT_CFG_PREFIX, ppsz_sout_options, p_access->p_cfg );
+    config_ChainParse( p_access, SOUT_CFG_PREFIX, ppsz_sout_options, p_access->p_cfg );
 
-    if( !( p_access->p_sys = malloc( sizeof( sout_access_out_sys_t ) ) ) )
+    if( !p_access->psz_path )
     {
-        msg_Err( p_access, "out of memory" );
-        return( VLC_EGENERIC );
+        msg_Err( p_access, "no file name specified" );
+        return VLC_EGENERIC;
     }
 
-    if( !p_access->psz_name )
+    if( !( p_access->p_sys = malloc( sizeof( sout_access_out_sys_t ) ) ) )
     {
-        msg_Err( p_access, "no file name specified" );
-        return VLC_EGENERIC;
+        return( VLC_ENOMEM );
     }
+
     i_flags = O_RDWR|O_CREAT|O_LARGEFILE;
 
     var_Get( p_access, SOUT_CFG_PREFIX "append", &val );
-    if( val.b_bool )
-    {
-        i_flags |= O_APPEND;
-    }
-    else
-    {
-        i_flags |= O_TRUNC;
-    }
-    if( !strcmp( p_access->psz_name, "-" ) )
+    i_flags |= val.b_bool ? O_APPEND : O_TRUNC;
+
+    if( !strcmp( p_access->psz_path, "-" ) )
     {
 #if defined(WIN32)
         setmode (STDOUT_FILENO, O_BINARY);
@@ -137,20 +132,29 @@ static int Open( vlc_object_t *p_this )
         p_access->p_sys->i_handle = STDOUT_FILENO;
         msg_Dbg( p_access, "using stdout" );
     }
-    else if( ( p_access->p_sys->i_handle =
-               open( p_access->psz_name, i_flags,
-                     S_IWRITE | S_IREAD | S_IRGRP | S_IROTH ) ) == -1 )
+    else
     {
-        msg_Err( p_access, "cannot open `%s'", p_access->psz_name );
-        free( p_access->p_sys );
-        return( VLC_EGENERIC );
+        int fd;
+        char *psz_tmp = str_format( p_access, p_access->psz_path );
+        path_sanitize( psz_tmp );
+
+        fd = utf8_open( psz_tmp, i_flags, 0666 );
+        free( psz_tmp );
+
+        if( fd == -1 )
+        {
+            msg_Err( p_access, "cannot open `%s' (%m)", p_access->psz_path );
+            free( p_access->p_sys );
+            return( VLC_EGENERIC );
+        }
+        p_access->p_sys->i_handle = fd;
     }
 
     p_access->pf_write = Write;
     p_access->pf_read  = Read;
     p_access->pf_seek  = Seek;
 
-    msg_Dbg( p_access, "file access output opened (`%s')", p_access->psz_name );
+    msg_Dbg( p_access, "file access output opened (`%s')", p_access->psz_path );
 
     /* Update pace control flag */
     if( p_access->psz_access && !strcmp( p_access->psz_access, "stream" ) )
@@ -166,7 +170,7 @@ static void Close( vlc_object_t * p_this )
 {
     sout_access_out_t *p_access = (sout_access_out_t*)p_this;
 
-    if( strcmp( p_access->psz_name, "-" ) )
+    if( strcmp( p_access->psz_path, "-" ) )
     {
         if( p_access->p_sys->i_handle )
         {
@@ -185,9 +189,9 @@ static void Close( vlc_object_t * p_this )
 /*****************************************************************************
  * Read: standard read on a file descriptor.
  *****************************************************************************/
-static int Read( sout_access_out_t *p_access, block_t *p_buffer )
+static ssize_t Read( sout_access_out_t *p_access, block_t *p_buffer )
 {
-    if( strcmp( p_access->psz_name, "-" ) )
+    if( strcmp( p_access->psz_path, "-" ) )
     {
         return read( p_access->p_sys->i_handle, p_buffer->p_buffer,
                      p_buffer->i_buffer );
@@ -200,7 +204,7 @@ static int Read( sout_access_out_t *p_access, block_t *p_buffer )
 /*****************************************************************************
  * Write: standard write on a file descriptor.
  *****************************************************************************/
-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 )
 {
     size_t i_write = 0;
 
@@ -223,7 +227,7 @@ static int Write( sout_access_out_t *p_access, block_t *p_buffer )
  *****************************************************************************/
 static int Seek( sout_access_out_t *p_access, off_t i_pos )
 {
-    if( strcmp( p_access->psz_name, "-" ) )
+    if( strcmp( p_access->psz_path, "-" ) )
     {
 #if defined( WIN32 ) && !defined( UNDER_CE )
         return( _lseeki64( p_access->p_sys->i_handle, i_pos, SEEK_SET ) );