/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <time.h>
-#include <fcntl.h>
-#include <errno.h>
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <sys/types.h>
+#include <time.h>
+#include <fcntl.h>
+#include <errno.h>
+
+#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_sout.h>
#include <vlc_block.h>
-#include <vlc_charset.h>
-#include "vlc_strings.h"
+#include <vlc_fs.h>
+#include <vlc_strings.h>
#if defined( WIN32 ) && !defined( UNDER_CE )
# include <io.h>
# define lseek _lseeki64
+#elif defined( __OS2__ )
+# include <io.h>
#else
# include <unistd.h>
#endif
#define APPEND_TEXT N_("Append to file")
#define APPEND_LONGTEXT N_( "Append to file if it exists instead " \
"of replacing it.")
-
-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" );
- add_shortcut( "stream" );
- add_bool( SOUT_CFG_PREFIX "append", 0, NULL, APPEND_TEXT,APPEND_LONGTEXT,
- true );
- set_callbacks( Open, Close );
-vlc_module_end();
+#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", "fd" )
+ add_bool( SOUT_CFG_PREFIX "append", false, APPEND_TEXT,APPEND_LONGTEXT,
+ true )
+#ifdef O_SYNC
+ add_bool( SOUT_CFG_PREFIX "sync", false, SYNC_TEXT,SYNC_LONGTEXT,
+ false )
+#endif
+ set_callbacks( Open, Close )
+vlc_module_end ()
/*****************************************************************************
* Exported prototypes
*****************************************************************************/
-static const char *ppsz_sout_options[] = {
- "append", NULL
+static const char *const ppsz_sout_options[] = {
+ "append",
+#ifdef O_SYNC
+ "sync",
+#endif
+ NULL
};
static ssize_t Write( sout_access_out_t *, block_t * );
static int Seek ( sout_access_out_t *, off_t );
static ssize_t Read ( sout_access_out_t *, block_t * );
-
-struct sout_access_out_sys_t
-{
- int i_handle;
-};
+static int Control( sout_access_out_t *, int, va_list );
/*****************************************************************************
* Open: open the file
bool append = var_GetBool( p_access, SOUT_CFG_PREFIX "append" );
+ if (!strcmp (p_access->psz_access, "fd"))
+ {
+ char *end;
+
+ fd = strtol (p_access->psz_path, &end, 0);
+ if (!*p_access->psz_path || *end)
+ {
+ msg_Err (p_access, "invalid file descriptor: %s",
+ p_access->psz_path);
+ return VLC_EGENERIC;
+ }
+ fd = vlc_dup (fd);
+ if (fd == -1)
+ {
+ msg_Err (p_access, "cannot use file descriptor: %m");
+ return VLC_EGENERIC;
+ }
+ }
+#ifndef UNDER_CE
+ else
if( !strcmp( p_access->psz_path, "-" ) )
{
-#ifdef WIN32
+#if defined( WIN32 ) || defined( __OS2__ )
setmode (fileno (stdout), O_BINARY);
#endif
- fd = dup (fileno (stdout));
+ fd = vlc_dup (fileno (stdout));
+ if (fd == -1)
+ {
+ msg_Err (p_access, "cannot use standard output: %m");
+ return VLC_EGENERIC;
+ }
msg_Dbg( p_access, "using stdout" );
}
+#endif
else
{
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 );
+ fd = vlc_open( psz_tmp, O_RDWR | O_CREAT | O_LARGEFILE |
+#ifdef O_SYNC
+ (var_GetBool( p_access, SOUT_CFG_PREFIX "sync" ) ? O_SYNC : 0) |
+#endif
+ (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;
+ if (fd == -1)
+ {
+ msg_Err (p_access, "cannot create %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);
- /* Update pace control flag */
- if( p_access->psz_access && !strcmp( p_access->psz_access, "stream" ) )
- p_access->p_sout->i_out_pace_nocontrol++;
-
return VLC_SUCCESS;
}
close( (intptr_t)p_access->p_sys );
- /* Update pace control flag */
- if( p_access->psz_access && !strcmp( p_access->psz_access, "stream" ) )
- p_access->p_sout->i_out_pace_nocontrol--;
-
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 )
+ {
+ case ACCESS_OUT_CONTROLS_PACE:
+ {
+ bool *pb = va_arg( args, bool * );
+ *pb = strcmp( p_access->psz_access, "stream" );
+ break;
+ }
+
+ default:
+ return VLC_EGENERIC;
+ }
+ return VLC_SUCCESS;
+}
+
/*****************************************************************************
* Read: standard read on a file descriptor.
*****************************************************************************/
static ssize_t Read( sout_access_out_t *p_access, block_t *p_buffer )
{
- return read( (intptr_t)p_access->p_sys, p_buffer->p_buffer,
- p_buffer->i_buffer );
+ ssize_t val;
+
+ do
+ val = read( (intptr_t)p_access->p_sys, p_buffer->p_buffer,
+ p_buffer->i_buffer );
+ while (val == -1 && errno == EINTR);
+ return val;
}
/*****************************************************************************
while( p_buffer )
{
- block_t *p_next = p_buffer->p_next;;
-
- i_write += write( (intptr_t)p_access->p_sys,
- p_buffer->p_buffer, p_buffer->i_buffer );
- block_Release( p_buffer );
-
- p_buffer = p_next;
+ 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;
+ }
+
+ 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;
}
projects / vlc / blobdiff