access_out_file: fix non-atomic write and error handling

diff --git a/modules/access_output/file.c b/modules/access_output/file.c
index 9cf4d98c99f6059f970529b214814b38b0e07528..639954889bc8ac6c17b56ca89bfd9634123319d3 100644 (file)
--- a/modules/access_output/file.c
+++ b/modules/access_output/file.c
@@ -173,8 +173,13 @@ static void Close( vlc_object_t * p_this )
  *****************************************************************************/
 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;
 }
 
 /*****************************************************************************
@@ -186,15 +191,29 @@ static ssize_t Write( sout_access_out_t *p_access, block_t *p_buffer )
 
     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;
 }