Ticket #1532: vlc-0.9.0-git.diff

vlc-0.9.0-git/modules/access/http.c

@@ -829 +829 @@
-    msg_Dbg( p_access, "trying to seek to %"PRId64, i_pos );
-
-    Disconnect( p_access );
+    if( p_access->info.i_pos < 0 )
+    {
+        msg_Err( p_access, "seeking too early" );
+        return Seek( p_access, 0);
+    }
+    else
+    {
+        int64_t i_size = p_access->info.i_size;
+        if(i_size > 0)
+        {
+            if( i_size < i_pos )
+            {
+                msg_Err( p_access, "seeking too far" );
+                // Fix me: This replicates the file.c behavior of returning
+                // success even when seeking too far.
+                return Seek( p_access, i_size );
+            }
+            else if ( i_size == i_pos )
+            {
+                // This is the only way I have found to seek to the end, and
+                // still leave the file handle open.
+                int retval = Seek( p_access, i_pos - 1);
+                if ( retval == VLC_SUCCESS ) {
+                  int8_t p_buffer[2];
+                  Read( p_access, p_buffer, (size_t)1 );
+                  // Reset EOF
+                  p_access->info.b_eof = false;
+                }
+                return retval;
+            }
+        }
+    }
-
+    p_access->info.i_pos = i_pos;
-    if( Connect( p_access, i_pos ) )
-    {
-        msg_Err( p_access, "seek failed" );
@@ -859 +892 @@
-            break;
-        case ACCESS_CAN_FASTSEEK:
-            pb_bool = (bool*)va_arg( args, bool* );
-
+
+
-            break;
-        case ACCESS_CAN_PAUSE:
-        case ACCESS_CAN_CONTROL_PACE: