/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h>
#include <sys/types.h>
#include <sys/stat.h>
-#include <string.h>
#include <time.h>
#include <fcntl.h>
#include <errno.h>
-#include <vlc/vlc.h>
-#include <vlc/sout.h>
-#include "charset.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#elif defined( WIN32 ) && !defined( UNDER_CE )
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_sout.h>
+#include <vlc_block.h>
+#include <vlc_charset.h>
+#include "vlc_strings.h"
+
+#if defined( WIN32 ) && !defined( UNDER_CE )
# include <io.h>
+# define lseek _lseeki64
+#else
+# include <unistd.h>
#endif
-/* For those platforms that don't use these */
-#ifndef STDOUT_FILENO
-# define STDOUT_FILENO 1
-#endif
#ifndef O_LARGEFILE
# define O_LARGEFILE 0
#endif
"of replacing it.")
vlc_module_begin();
- set_description( _("File stream output") );
- set_shortname( _("File" ));
+ set_description( N_("File stream output") );
+ set_shortname( N_("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();
/*****************************************************************************
* Exported prototypes
*****************************************************************************/
-static const char *ppsz_sout_options[] = {
+static const char *const 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
{
static int Open( vlc_object_t *p_this )
{
sout_access_out_t *p_access = (sout_access_out_t*)p_this;
- int i_flags;
- vlc_value_t val;
+ int fd;
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;
}
- if( !( p_access->p_sys = malloc( sizeof( sout_access_out_sys_t ) ) ) )
- {
- return( VLC_ENOMEM );
- }
-
- i_flags = O_RDWR|O_CREAT|O_LARGEFILE;
+ bool append = var_GetBool( p_access, SOUT_CFG_PREFIX "append" );
- 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);
+#ifdef WIN32
+ setmode (fileno (stdout), O_BINARY);
#endif
- p_access->p_sys->i_handle = STDOUT_FILENO;
+ fd = dup (fileno (stdout));
msg_Dbg( p_access, "using stdout" );
}
else
{
- const char *psz_tmp;
- char *psz_tmp2, *psz_rewriten;
- int fd, i, i_length = strlen( p_access->psz_name );
- for( i = 0, psz_tmp = p_access->psz_name ;
- ( 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 = p_access->psz_name;
- 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 = utf8_open( psz_rewriten, i_flags, 0666 );
- free( psz_rewriten );
- }
- else
- fd = utf8_open( p_access->psz_name, i_flags, 0666 );
-
- if( fd == -1 )
- {
- msg_Err( p_access, "cannot open `%s' (%s)", p_access->psz_name,
- strerror( errno ) );
- free( p_access->p_sys );
- return( VLC_EGENERIC );
- }
- p_access->p_sys->i_handle = fd;
+ char *psz_tmp = str_format( p_access, p_access->psz_path );
+ path_sanitize( psz_tmp );
+
+ fd = utf8_open( psz_tmp, O_RDWR | O_CREAT | O_LARGEFILE |
+ (append ? 0 : O_TRUNC), 0666 );
+ free( psz_tmp );
+ }
+
+ if (fd == -1)
+ {
+ msg_Err( p_access, "cannot open `%s' (%m)", p_access->psz_path );
+ return VLC_EGENERIC;
}
p_access->pf_write = Write;
p_access->pf_read = Read;
p_access->pf_seek = Seek;
+ p_access->p_sys = (void *)(intptr_t)fd;
- 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 );
+ if (append)
+ lseek (fd, 0, SEEK_END);
/* 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( p_access->p_sys->i_handle )
- {
- close( p_access->p_sys->i_handle );
- }
- }
- free( p_access->p_sys );
+ close( (intptr_t)p_access->p_sys );
/* Update pace control flag */
if( p_access->psz_access && !strcmp( p_access->psz_access, "stream" ) )
/*****************************************************************************
* 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, "-" ) )
- {
- return read( p_access->p_sys->i_handle, p_buffer->p_buffer,
- p_buffer->i_buffer );
- }
-
- msg_Err( p_access, "cannot read while using stdout" );
- return VLC_EGENERIC;
+ return read( (intptr_t)p_access->p_sys, 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;
{
block_t *p_next = p_buffer->p_next;;
- i_write += write( p_access->p_sys->i_handle,
+ i_write += write( (intptr_t)p_access->p_sys,
p_buffer->p_buffer, p_buffer->i_buffer );
block_Release( p_buffer );
*****************************************************************************/
static int Seek( sout_access_out_t *p_access, off_t i_pos )
{
- if( strcmp( p_access->psz_name, "-" ) )
- {
-#if defined( WIN32 ) && !defined( UNDER_CE )
- return( _lseeki64( p_access->p_sys->i_handle, i_pos, SEEK_SET ) );
-#else
- return( lseek( p_access->p_sys->i_handle, i_pos, SEEK_SET ) );
-#endif
- }
- else
- {
- msg_Err( p_access, "cannot seek while using stdout" );
- return VLC_EGENERIC;
- }
+ return lseek( (intptr_t)p_access->p_sys, i_pos, SEEK_SET );
}