s/psz_name/psz_path/ for consistency

[vlc] / modules / access_output / file.c

diff --git a/modules/access_output/file.c b/modules/access_output/file.c
index 200860e5a12c6a2cc3d8d5a956c93f2e14ea61d1..6d28236957eb1d0342304e70d91b971a8e67eb7c 100644 (file)
--- a/modules/access_output/file.c
+++ b/modules/access_output/file.c
@@ -34,8 +34,10 @@
 #include <errno.h>
 
 #include <vlc/vlc.h>
-#include <vlc/sout.h>
-#include "charset.h"
+#include <vlc_sout.h>
+#include <vlc_block.h>
+#include <vlc_charset.h>
+#include "vlc_strings.h"
 
 #ifdef HAVE_UNISTD_H
 #   include <unistd.h>
@@ -64,7 +66,7 @@ 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 );
@@ -103,7 +105,7 @@ static int Open( vlc_object_t *p_this )
 
     config_ChainParse( p_access, SOUT_CFG_PREFIX, ppsz_sout_options, p_access->p_cfg );
 
-    if( !p_access->psz_name )
+    if( !p_access->psz_path )
     {
         msg_Err( p_access, "no file name specified" );
         return VLC_EGENERIC;
@@ -119,7 +121,7 @@ static int Open( vlc_object_t *p_this )
     var_Get( p_access, SOUT_CFG_PREFIX "append", &val );
     i_flags |= val.b_bool ? O_APPEND : O_TRUNC;
 
-    if( !strcmp( p_access->psz_name, "-" ) )
+    if( !strcmp( p_access->psz_path, "-" ) )
     {
 #if defined(WIN32)
         setmode (STDOUT_FILENO, O_BINARY);
@@ -129,45 +131,16 @@ static int Open( vlc_object_t *p_this )
     }
     else
     {
-        char *psz_localname = ToLocale( p_access->psz_name );
-        char *psz_tmp, *psz_tmp2, *psz_rewriten;
-        int fd, i, i_length = strlen( psz_localname );
-        for( i = 0, psz_tmp = psz_localname ;
-             ( psz_tmp = strstr( psz_tmp, "%T" ) ) ; psz_tmp++, i++ )
-            ;
-        if( i )
-        {
-            i_length += 32 * i;
-            psz_rewriten = (char *) malloc( i_length );
-            if( ! psz_rewriten )
-                return ( VLC_EGENERIC );
-            psz_tmp  = psz_localname;
-            psz_tmp2 = psz_rewriten;
-            while( *psz_tmp )
-            {
-                if( ( *psz_tmp == '%' ) && ( *(psz_tmp+1) == 'T' ) )
-                {
-                    time_t t;
-                    time( &t );
-                    psz_tmp2 += sprintf( psz_tmp2, "%d", (int) t );
-                    psz_tmp+=2;
-                }
-                else
-                    *psz_tmp2++ = *psz_tmp++;
-            }
-            *psz_tmp2 = *psz_tmp;
-            fd = open( psz_rewriten, i_flags, 0666 );
-            LocaleFree( psz_localname );
-            free( psz_rewriten );
-        }
-        else
-        {
-            fd = open( psz_localname, i_flags, 0666 );
-            LocaleFree( psz_localname );
-        }
+        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' (%s)", p_access->psz_name,
+            msg_Err( p_access, "cannot open `%s' (%s)", p_access->psz_path,
                      strerror( errno ) );
             free( p_access->p_sys );
             return( VLC_EGENERIC );
@@ -179,7 +152,7 @@ static int Open( vlc_object_t *p_this )
     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" ) )
@@ -195,7 +168,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 )
         {
@@ -216,7 +189,7 @@ static void Close( vlc_object_t * p_this )
  *****************************************************************************/
 static int 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 );
@@ -252,7 +225,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 ) );