#include <vlc_block.h>
#include <vlc_fs.h>
#include <vlc_strings.h>
+#include <vlc_dialog.h>
#if defined( WIN32 ) || defined( __OS2__ )
# include <io.h>
-#else
+#endif
+
+#ifndef WIN32
# include <unistd.h>
#endif
static void Close( vlc_object_t * );
#define SOUT_CFG_PREFIX "sout-file-"
+#define OVERWRITE_TEXT N_("Overwrite existing file")
+#define OVERWRITE_LONGTEXT N_( \
+ "If the file already exists, it will be overwritten.")
#define APPEND_TEXT N_("Append to file")
#define APPEND_LONGTEXT N_( "Append to file if it exists instead " \
"of replacing it.")
+#define FORMAT_TEXT N_("Format time and date")
+#define FORMAT_LONGTEXT N_("Perform ISO C time and date formatting " \
+ "on the file path")
#define SYNC_TEXT N_("Synchronous writing")
#define SYNC_LONGTEXT N_( "Open the file with synchronous writing.")
set_category( CAT_SOUT )
set_subcategory( SUBCAT_SOUT_ACO )
add_shortcut( "file", "stream", "fd" )
+ add_bool( SOUT_CFG_PREFIX "overwrite", true, OVERWRITE_TEXT,
+ OVERWRITE_LONGTEXT, true )
add_bool( SOUT_CFG_PREFIX "append", false, APPEND_TEXT,APPEND_LONGTEXT,
true )
+ add_bool( SOUT_CFG_PREFIX "format", false, FORMAT_TEXT, FORMAT_LONGTEXT,
+ true )
#ifdef O_SYNC
add_bool( SOUT_CFG_PREFIX "sync", false, SYNC_TEXT,SYNC_LONGTEXT,
false )
*****************************************************************************/
static const char *const ppsz_sout_options[] = {
"append",
+ "format",
+ "overwrite",
#ifdef O_SYNC
"sync",
#endif
return VLC_EGENERIC;
}
+ bool overwrite = var_GetBool (p_access, SOUT_CFG_PREFIX"overwrite");
bool append = var_GetBool( p_access, SOUT_CFG_PREFIX "append" );
if (!strcmp (p_access->psz_access, "fd"))
return VLC_EGENERIC;
}
}
-#ifndef UNDER_CE
else
if( !strcmp( p_access->psz_path, "-" ) )
{
}
msg_Dbg( p_access, "using stdout" );
}
-#endif
else
{
- char *psz_tmp = str_format( p_access, p_access->psz_path );
- path_sanitize( psz_tmp );
+ const char *path = p_access->psz_path;
+ char *buf = NULL;
- fd = vlc_open( psz_tmp, O_RDWR | O_CREAT | O_LARGEFILE |
+ if (var_InheritBool (p_access, SOUT_CFG_PREFIX"format"))
+ {
+ buf = str_format_time (path);
+ path_sanitize (buf);
+ path = buf;
+ }
+
+ int flags = O_RDWR | O_CREAT | O_LARGEFILE;
+ if (!overwrite)
+ flags |= O_EXCL;
+ if (!append)
+ flags |= O_TRUNC;
#ifdef O_SYNC
- (var_GetBool( p_access, SOUT_CFG_PREFIX "sync" ) ? O_SYNC : 0) |
+ if (var_GetBool (p_access, SOUT_CFG_PREFIX"sync"))
+ flags |= O_SYNC;
#endif
- (append ? 0 : O_TRUNC), 0666 );
- free( psz_tmp );
- if (fd == -1)
+ do
{
- msg_Err (p_access, "cannot create %s: %m", p_access->psz_path);
- return VLC_EGENERIC;
+ fd = vlc_open (path, flags, 0666);
+ if (fd != -1)
+ break;
+ if (fd == -1)
+ msg_Err (p_access, "cannot create %s: %m", path);
+ if (overwrite || errno != EEXIST)
+ break;
+ flags &= ~O_EXCL;
}
+ while (dialog_Question (p_access, path,
+ _("The output file already exists. "
+ "If recording continues, the file will be "
+ "overridden and its content will be lost."),
+ _("Keep existing file"),
+ _("Overwrite"), NULL) == 2);
+ free (buf);
+ if (fd == -1)
+ return VLC_EGENERIC;
}
p_access->pf_write = Write;
{
ssize_t val = write ((intptr_t)p_access->p_sys,
p_buffer->p_buffer, p_buffer->i_buffer);
- if (val == -1)
+ if (val <= 0)
{
if (errno == EINTR)
continue;
block_ChainRelease (p_buffer);
+ msg_Err( p_access, "cannot write: %m" );
return -1;
}