* modules/access_output/file.c: make the output file writeable by the owner.

[vlc] / modules / access_output / file.c

diff --git a/modules/access_output/file.c b/modules/access_output/file.c
index 4c05504a9f4afd859c4c200fc363608e107864fe..19fe63fa70dd217990ee9e67cb8549c7ed394d00 100644 (file)
--- a/modules/access_output/file.c
+++ b/modules/access_output/file.c
@@ -2,7 +2,7 @@
  * file.c
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: file.c,v 1.3 2003/02/16 14:10:44 fenrir Exp $
+ * $Id: file.c,v 1.8 2003/06/21 14:24:30 gbazin Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *          Eric Petit <titer@videolan.org>
@@ -38,10 +38,18 @@
 
 #ifdef HAVE_UNISTD_H
 #   include <unistd.h>
-#elif defined( _MSC_VER ) && defined( _WIN32 ) && !defined( UNDER_CE )
+#elif defined( WIN32 ) && !defined( UNDER_CE )
 #   include <io.h>
 #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
+
 /*****************************************************************************
  * Exported prototypes
  *****************************************************************************/
@@ -63,7 +71,7 @@ vlc_module_end();
 
 struct sout_access_out_sys_t
 {
-    FILE *p_file;
+    int i_handle;
 
 };
 
@@ -80,7 +88,19 @@ static int Open( vlc_object_t *p_this )
         return( VLC_EGENERIC );
     }
 
-    if( !( p_access->p_sys->p_file = fopen( p_access->psz_name, "wb" ) ) )
+    if( !p_access->psz_name )
+    {
+        msg_Err( p_access, "no file name specified" );
+        return VLC_EGENERIC;
+    }
+    if( !strcmp( p_access->psz_name, "-" ) )
+    {
+        p_access->p_sys->i_handle = STDOUT_FILENO;
+        msg_Dbg( p_access, "using stdout" );
+    }
+    else if( ( p_access->p_sys->i_handle =
+               open( p_access->psz_name, O_WRONLY|O_CREAT|O_TRUNC,
+                     S_IWRITE | S_IREAD | S_IRGRP | S_IROTH ) ) == -1 )
     {
         msg_Err( p_access, "cannot open `%s'", p_access->psz_name );
         free( p_access->p_sys );
@@ -101,9 +121,12 @@ static void Close( vlc_object_t * p_this )
 {
     sout_access_out_t   *p_access = (sout_access_out_t*)p_this;
 
-    if( p_access->p_sys->p_file )
+    if( strcmp( p_access->psz_name, "-" ) )
     {
-        fclose( p_access->p_sys->p_file );
+        if( p_access->p_sys->i_handle )
+        {
+            close( p_access->p_sys->i_handle );
+        }
     }
     free( p_access->p_sys );
 
@@ -121,8 +144,8 @@ static int Write( sout_access_out_t *p_access, sout_buffer_t *p_buffer )
     {
         sout_buffer_t *p_next;
 
-        i_write += fwrite( p_buffer->p_buffer, 1, p_buffer->i_size,
-                           p_access->p_sys->p_file );
+        i_write += write( p_access->p_sys->i_handle, p_buffer->p_buffer,
+                          p_buffer->i_size );
         p_next = p_buffer->p_next;
         sout_BufferDelete( p_access->p_sout, p_buffer );
         p_buffer = p_next;
@@ -137,10 +160,19 @@ static int Write( sout_access_out_t *p_access, sout_buffer_t *p_buffer )
  *****************************************************************************/
 static int Seek( sout_access_out_t *p_access, off_t i_pos )
 {
-
     msg_Dbg( p_access, "Seek: pos:"I64Fd, (int64_t)i_pos );
-    return( fseek( p_access->p_sys->p_file, i_pos, SEEK_SET ) );
-}
-
-
 
+    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;
+    }
+}