Revert [19270]

[vlc] / modules / access_filter / dump.c

diff --git a/modules/access_filter/dump.c b/modules/access_filter/dump.c
index 953badc9ce63dadacc2f7ebd913d157a2457bc34..38139d0adfa6b13f73c570ec71e8125c0c71f5ba 100644 (file)
--- a/modules/access_filter/dump.c
+++ b/modules/access_filter/dump.c
@@ -27,10 +27,11 @@
 #include <stdlib.h>
 #include <assert.h>
 #include <time.h>
+#include <errno.h>
 
-#include "vlc_access.h"
-#include "vlc_block.h"
-#include "charset.h"
+#include <vlc_access.h>
+
+#include <vlc_charset.h>
 #include "vlc_keys.h"
 
 #define DEFAULT_MARGIN 32 // megabytes
@@ -74,6 +75,7 @@ struct access_sys_t
 {
     FILE *stream;
     int64_t tmp_max;
+    int64_t dumpsize;
 };
 
 /**
@@ -144,21 +146,34 @@ static void Dump (access_t *access, const uint8_t *buffer, size_t len)
     access_sys_t *p_sys = access->p_sys;
     FILE *stream = p_sys->stream;
 
-    if ((stream == NULL) || (len == 0))
+    if ((stream == NULL) /* not dumping */
+     || (access->info.i_pos < p_sys->dumpsize) /* already known data */)
         return;
 
+    size_t needed = access->info.i_pos - p_sys->dumpsize;
+    if (len < needed)
+        return; /* gap between data and dump offset (seek too far ahead?) */
+
+    buffer += len - needed;
+    len = needed;
+
+    if (len == 0)
+        return; /* no useful data */
+
     if ((p_sys->tmp_max != -1) && (access->info.i_pos > p_sys->tmp_max))
     {
         msg_Dbg (access, "too much data - dump will not work");
         goto error;
     }
 
+    assert (len > 0);
     if (fwrite (buffer, len, 1, stream) != 1)
     {
         msg_Err (access, "cannot write to file: %s", strerror (errno));
         goto error;
     }
 
+    p_sys->dumpsize += len;
     return;
 
 error:
@@ -176,7 +191,6 @@ static int Read (access_t *access, uint8_t *buffer, int len)
     access->info = src->info;
 
     Dump (access, buffer, len);
-    //Trigger (access);
 
     return len;
 }
@@ -220,11 +234,7 @@ static int Seek (access_t *access, int64_t offset)
     }
 
     if (p_sys->stream != NULL)
-    {
-        msg_Dbg (access, "seeking - dump will not work");
-        fclose (p_sys->stream);
-        p_sys->stream = NULL;
-    }
+        msg_Dbg (access, "seeking - dump might not work");
 
     src->info.i_update = access->info.i_update;
     int ret = src->pf_seek (src, offset);
@@ -233,6 +243,25 @@ static int Seek (access_t *access, int64_t offset)
 }
 
 
+#ifndef HAVE_LOCALTIME_R
+static inline struct tm *localtime_r (const time_t *now, struct tm *res)
+{
+    struct tm *unsafe = localtime (now);
+    /*
+     * This is not thread-safe. Blame your C library.
+     * On Win32 there SHOULD be _localtime_s instead, but of course
+     * Cygwin and Mingw32 don't know about it. You're on your own if you
+     * this platform.
+     */
+    if (unsafe == NULL)
+        return NULL;
+
+    memcpy (res, unsafe, sizeof (*res));
+    return res;
+}
+#endif
+
+
 static void Trigger (access_t *access)
 {
     access_sys_t *p_sys = access->p_sys;
@@ -264,7 +293,7 @@ static void Trigger (access_t *access)
 
     msg_Info (access, "dumping media to \"%s\"...", filename);
 
-    FILE *newstream = fopen (filename, "wb");
+    FILE *newstream = utf8_fopen (filename, "wb");
     if (newstream == NULL)
     {
         msg_Err (access, "cannot create dump file \"%s\": %s", filename,