msi: cleaning and cosmetics

[vlc] / modules / access_output / file.c

diff --git a/modules/access_output/file.c b/modules/access_output/file.c
index f104f59b0dd247200c30453a5f03f0351f108f3b..07ecaafe1f4517fd0a4f8e280d03b1079a7255c2 100644 (file)
--- a/modules/access_output/file.c
+++ b/modules/access_output/file.c
@@ -41,11 +41,13 @@
 #include <vlc_block.h>
 #include <vlc_fs.h>
 #include <vlc_strings.h>
+#include <vlc_dialog.h>
 
-#if defined( WIN32 ) && !defined( UNDER_CE )
+#if defined( WIN32 ) || defined( __OS2__ )
 #   include <io.h>
-#   define lseek _lseeki64
-#else
+#endif
+
+#ifndef WIN32
 #   include <unistd.h>
 #endif
 
@@ -60,9 +62,15 @@ static int  Open ( vlc_object_t * );
 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.")
 
@@ -73,8 +81,12 @@ vlc_module_begin ()
     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 )
@@ -88,6 +100,8 @@ vlc_module_end ()
  *****************************************************************************/
 static const char *const ppsz_sout_options[] = {
     "append",
+    "format",
+    "overwrite",
 #ifdef O_SYNC
     "sync",
 #endif
@@ -99,11 +113,6 @@ static int Seek ( sout_access_out_t *, off_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
-{
-    int i_handle;
-};
-
 /*****************************************************************************
  * Open: open the file
  *****************************************************************************/
@@ -120,6 +129,7 @@ static int Open( vlc_object_t *p_this )
         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"))
@@ -140,14 +150,13 @@ static int Open( vlc_object_t *p_this )
             return VLC_EGENERIC;
         }
     }
-#ifndef UNDER_CE
     else
     if( !strcmp( p_access->psz_path, "-" ) )
     {
-#ifdef WIN32
-        setmode (fileno (stdout), O_BINARY);
+#if defined( WIN32 ) || defined( __OS2__ )
+        setmode (STDOUT_FILENO, O_BINARY);
 #endif
-        fd = vlc_dup (fileno (stdout));
+        fd = vlc_dup (STDOUT_FILENO);
         if (fd == -1)
         {
             msg_Err (p_access, "cannot use standard output: %m");
@@ -155,23 +164,47 @@ static int Open( vlc_object_t *p_this )
         }
         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;
@@ -241,11 +274,12 @@ static ssize_t Write( sout_access_out_t *p_access, block_t *p_buffer )
     {
         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;
         }