X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess_output%2Ffile.c;h=91ae8636690cc11a0e1c7c6b687d38f513cc1317;hb=8fd093d4130b4e7a5b4ca82f3934b6fdf1a10c8d;hp=b26db480e7abebf5328154fc396a31de70fd56ec;hpb=298f0e468edf5cbbf05d852bb58c7ef762a6a571;p=vlc diff --git a/modules/access_output/file.c b/modules/access_output/file.c index b26db480e7..91ae863669 100644 --- a/modules/access_output/file.c +++ b/modules/access_output/file.c @@ -1,7 +1,7 @@ /***************************************************************************** * file.c ***************************************************************************** - * Copyright (C) 2001, 2002 VideoLAN + * Copyright (C) 2001, 2002 the VideoLAN team * $Id$ * * Authors: Laurent Aimar @@ -19,37 +19,38 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include -#include -#include +#include #include #include -#include -#include +#include +#include +#include +#include +#include +#include -#ifdef HAVE_UNISTD_H -# include -#elif defined( WIN32 ) && !defined( UNDER_CE ) +#if defined( WIN32 ) && !defined( UNDER_CE ) # include +# define lseek _lseeki64 +#else +# include #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 +#ifndef O_LARGEFILE +# define O_LARGEFILE 0 #endif /***************************************************************************** @@ -58,20 +59,39 @@ static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); -vlc_module_begin(); - set_description( _("File stream ouput") ); - set_capability( "sout access", 50 ); - add_shortcut( "file" ); - set_callbacks( Open, Close ); -vlc_module_end(); +#define SOUT_CFG_PREFIX "sout-file-" +#define APPEND_TEXT N_("Append to file") +#define APPEND_LONGTEXT N_( "Append to file if it exists instead " \ + "of replacing it.") +#define SYNC_TEXT N_("Synchronous writing") +#define SYNC_LONGTEXT N_( "Open the file with synchronous writing.") + +vlc_module_begin () + 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", "stream" ) + add_bool( SOUT_CFG_PREFIX "append", false, NULL, APPEND_TEXT,APPEND_LONGTEXT, + true ) + add_bool( SOUT_CFG_PREFIX "sync", false, NULL, SYNC_TEXT,SYNC_LONGTEXT, + false ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Exported prototypes *****************************************************************************/ -static int Write( sout_access_out_t *, block_t * ); +static const char *const ppsz_sout_options[] = { + "append", "sync", NULL +}; + +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 * ); +static int Control( sout_access_out_t *, int, va_list ); struct sout_access_out_sys_t { @@ -84,47 +104,62 @@ 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; + int fd; + bool sync; - if( !( p_access->p_sys = malloc( sizeof( sout_access_out_sys_t ) ) ) ) - { - msg_Err( p_access, "out of memory" ); - return( VLC_EGENERIC ); - } + 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; } - i_flags = O_RDWR|O_CREAT; - if( sout_cfg_find_value( p_access->p_cfg, "append" ) ) + + bool append = var_GetBool( p_access, SOUT_CFG_PREFIX "append" ); + sync = var_GetBool( p_access, SOUT_CFG_PREFIX "sync" ); + + if( !strcmp( p_access->psz_path, "-" ) ) { - i_flags |= O_APPEND; +#ifndef UNDER_CE +#ifdef WIN32 + setmode (fileno (stdout), O_BINARY); +#endif + fd = vlc_dup (fileno (stdout)); + msg_Dbg( p_access, "using stdout" ); +#else +#warning stdout is not supported on Windows Mobile, but may be used on Windows CE + fd = -1; +#endif } else { - i_flags |= O_TRUNC; - } - if( !strcmp( p_access->psz_name, "-" ) ) - { - p_access->p_sys->i_handle = STDOUT_FILENO; - msg_Dbg( p_access, "using stdout" ); + char *psz_tmp = str_format( p_access, p_access->psz_path ); + path_sanitize( psz_tmp ); + + fd = vlc_open( psz_tmp, O_RDWR | O_CREAT | O_LARGEFILE | +#ifdef O_SYNC + (sync ? O_SYNC : 0) | +#endif + (append ? 0 : O_TRUNC), 0666 ); + free( psz_tmp ); } - else if( ( p_access->p_sys->i_handle = - open( p_access->psz_name, i_flags, - S_IWRITE | S_IREAD | S_IRGRP | S_IROTH ) ) == -1 ) + + if (fd == -1) { - msg_Err( p_access, "cannot open `%s'", p_access->psz_name ); - free( p_access->p_sys ); - return( VLC_EGENERIC ); + 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->pf_control = Control; + p_access->p_sys = (void *)(intptr_t)fd; + + msg_Dbg( p_access, "file access output opened (%s)", p_access->psz_path ); + if (append) + lseek (fd, 0, SEEK_END); - msg_Dbg( p_access, "file access output opened (`%s')", p_access->psz_name ); return VLC_SUCCESS; } @@ -135,51 +170,74 @@ 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, "-" ) ) + close( (intptr_t)p_access->p_sys ); + + msg_Dbg( p_access, "file access output closed" ); +} + +static int Control( sout_access_out_t *p_access, int i_query, va_list args ) +{ + switch( i_query ) { - if( p_access->p_sys->i_handle ) + case ACCESS_OUT_CONTROLS_PACE: { - close( p_access->p_sys->i_handle ); + bool *pb = va_arg( args, bool * ); + *pb = strcmp( p_access->psz_access, "stream" ); + break; } - } - free( p_access->p_sys ); - msg_Dbg( p_access, "file access output closed" ); + default: + return VLC_EGENERIC; + } + return VLC_SUCCESS; } /***************************************************************************** * 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 ); - } + ssize_t val; - msg_Err( p_access, "cannot read while using stdout" ); - return VLC_EGENERIC; + do + val = read( (intptr_t)p_access->p_sys, p_buffer->p_buffer, + p_buffer->i_buffer ); + while (val == -1 && errno == EINTR); + return val; } /***************************************************************************** * 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; while( p_buffer ) { - block_t *p_next = p_buffer->p_next;; - - i_write += write( p_access->p_sys->i_handle, - p_buffer->p_buffer, p_buffer->i_buffer ); - block_Release( p_buffer ); + ssize_t val = write ((intptr_t)p_access->p_sys, + p_buffer->p_buffer, p_buffer->i_buffer); + if (val == -1) + { + if (errno == EINTR) + continue; + block_ChainRelease (p_buffer); + return -1; + } - p_buffer = p_next; + if ((size_t)val >= p_buffer->i_buffer) + { + block_t *p_next = p_buffer->p_next; + block_Release (p_buffer); + p_buffer = p_next; + } + else + { + p_buffer->p_buffer += val; + p_buffer->i_buffer -= val; + } + i_write += val; } - return i_write; } @@ -188,17 +246,5 @@ 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 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 ); }