/*****************************************************************************
* 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 "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>
"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
{
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;
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);
}
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,
- strerror( errno ) );
+ msg_Err( p_access, "cannot open `%s' (%m)", p_access->psz_path );
free( p_access->p_sys );
return( VLC_EGENERIC );
}
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" ) )
{
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 )
{
/*****************************************************************************
* 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 );
/*****************************************************************************
* 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;
*****************************************************************************/
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 ) );