Make file_open() return the error code set in errno if open() fails,

[ffmpeg] / libavformat / file.c

diff --git a/libavformat/file.c b/libavformat/file.c
index c03db02dcc8fddf9644658d854e08ccdab183e30..8873d5fcafe8ba61d826400bb1ee3fb7b245487f 100644 (file)
--- a/libavformat/file.c
+++ b/libavformat/file.c
@@ -18,11 +18,18 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavutil/avstring.h"
 #include "avformat.h"
-#include "avstring.h"
 #include <fcntl.h>
+#if HAVE_SETMODE
+#include <io.h>
+#endif
 #include <unistd.h>
+#include <sys/stat.h>
 #include <sys/time.h>
+#include <stdlib.h>
+#include "os_support.h"
 
 
 /* standard file protocol */
@@ -45,37 +52,47 @@ static int file_open(URLContext *h, const char *filename, int flags)
     access |= O_BINARY;
 #endif
     fd = open(filename, access, 0666);
-    if (fd < 0)
-        return AVERROR(ENOENT);
-    h->priv_data = (void *)(size_t)fd;
+    if (fd == -1)
+        return AVERROR(errno);
+    h->priv_data = (void *) (intptr_t) fd;
     return 0;
 }
 
 static int file_read(URLContext *h, unsigned char *buf, int size)
 {
-    int fd = (size_t)h->priv_data;
+    int fd = (intptr_t) h->priv_data;
     return read(fd, buf, size);
 }
 
 static int file_write(URLContext *h, unsigned char *buf, int size)
 {
-    int fd = (size_t)h->priv_data;
+    int fd = (intptr_t) h->priv_data;
     return write(fd, buf, size);
 }
 
 /* XXX: use llseek */
-static offset_t file_seek(URLContext *h, offset_t pos, int whence)
+static int64_t file_seek(URLContext *h, int64_t pos, int whence)
 {
-    int fd = (size_t)h->priv_data;
+    int fd = (intptr_t) h->priv_data;
+    if (whence == AVSEEK_SIZE) {
+        struct stat st;
+        int ret = fstat(fd, &st);
+        return ret < 0 ? AVERROR(errno) : st.st_size;
+    }
     return lseek(fd, pos, whence);
 }
 
 static int file_close(URLContext *h)
 {
-    int fd = (size_t)h->priv_data;
+    int fd = (intptr_t) h->priv_data;
     return close(fd);
 }
 
+static int file_get_handle(URLContext *h)
+{
+    return (intptr_t) h->priv_data;
+}
+
 URLProtocol file_protocol = {
     "file",
     file_open,
@@ -83,6 +100,7 @@ URLProtocol file_protocol = {
     file_write,
     file_seek,
     file_close,
+    .url_get_file_handle = file_get_handle,
 };
 
 /* pipe protocol */
@@ -90,30 +108,29 @@ URLProtocol file_protocol = {
 static int pipe_open(URLContext *h, const char *filename, int flags)
 {
     int fd;
+    char *final;
+    av_strstart(filename, "pipe:", &filename);
 
-    if (flags & URL_WRONLY) {
-        fd = 1;
-    } else {
-        fd = 0;
+    fd = strtol(filename, &final, 10);
+    if((filename == final) || *final ) {/* No digits found, or something like 10ab */
+        if (flags & URL_WRONLY) {
+            fd = 1;
+        } else {
+            fd = 0;
+        }
     }
-#ifdef O_BINARY
+#if HAVE_SETMODE
     setmode(fd, O_BINARY);
 #endif
-    h->priv_data = (void *)(size_t)fd;
+    h->priv_data = (void *) (intptr_t) fd;
     h->is_streamed = 1;
     return 0;
 }
 
-static int pipe_close(URLContext *h)
-{
-    return 0;
-}
-
 URLProtocol pipe_protocol = {
     "pipe",
     pipe_open,
     file_read,
     file_write,
-    NULL,
-    pipe_close,
+    .url_get_file_handle = file_get_handle,
 };