Merge commit 'd9a2e87b1ce44cce23801e7ec6810f8bf994fa23'

[ffmpeg] / libavformat / file.c

diff --git a/libavformat/file.c b/libavformat/file.c
index c54ec2882f9b0920b35e4a4dec56d0762825bb92..8c41a3c3724e4a0a3c746f759fe8255abd271af0 100644 (file)
--- a/libavformat/file.c
+++ b/libavformat/file.c
@@ -20,37 +20,67 @@
  */
 
 #include "libavutil/avstring.h"
+#include "libavutil/opt.h"
 #include "avformat.h"
 #include <fcntl.h>
-#if HAVE_SETMODE
+#if HAVE_IO_H
 #include <io.h>
 #endif
+#if HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <sys/stat.h>
 #include <stdlib.h>
 #include "os_support.h"
 #include "url.h"
 
+/* Some systems may not have S_ISFIFO */
+#ifndef S_ISFIFO
+#  ifdef S_IFIFO
+#    define S_ISFIFO(m) (((m) & S_IFMT) == S_IFIFO)
+#  else
+#    define S_ISFIFO(m) 0
+#  endif
+#endif
 
 /* standard file protocol */
 
+typedef struct FileContext {
+    const AVClass *class;
+    int fd;
+    int trunc;
+} FileContext;
+
+static const AVOption file_options[] = {
+    { "truncate", "Truncate existing files on write", offsetof(FileContext, trunc), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, 1, AV_OPT_FLAG_ENCODING_PARAM },
+    { NULL }
+};
+
+static const AVClass file_class = {
+    .class_name = "file",
+    .item_name  = av_default_item_name,
+    .option     = file_options,
+    .version    = LIBAVUTIL_VERSION_INT,
+};
+
 static int file_read(URLContext *h, unsigned char *buf, int size)
 {
-    int fd = (intptr_t) h->priv_data;
-    int r = read(fd, buf, size);
+    FileContext *c = h->priv_data;
+    int r = read(c->fd, buf, size);
     return (-1 == r)?AVERROR(errno):r;
 }
 
 static int file_write(URLContext *h, const unsigned char *buf, int size)
 {
-    int fd = (intptr_t) h->priv_data;
-    int r = write(fd, buf, size);
+    FileContext *c = h->priv_data;
+    int r = write(c->fd, buf, size);
     return (-1 == r)?AVERROR(errno):r;
 }
 
 static int file_get_handle(URLContext *h)
 {
-    return (intptr_t) h->priv_data;
+    FileContext *c = h->priv_data;
+    return c->fd;
 }
 
 static int file_check(URLContext *h, int mask)
@@ -70,6 +100,7 @@ static int file_check(URLContext *h, int mask)
 
 static int file_open(URLContext *h, const char *filename, int flags)
 {
+    FileContext *c = h->priv_data;
     int access;
     int fd;
     struct stat st;
@@ -77,9 +108,13 @@ static int file_open(URLContext *h, const char *filename, int flags)
     av_strstart(filename, "file:", &filename);
 
     if (flags & AVIO_FLAG_WRITE && flags & AVIO_FLAG_READ) {
-        access = O_CREAT | O_TRUNC | O_RDWR;
+        access = O_CREAT | O_RDWR;
+        if (c->trunc)
+            access |= O_TRUNC;
     } else if (flags & AVIO_FLAG_WRITE) {
-        access = O_CREAT | O_TRUNC | O_WRONLY;
+        access = O_CREAT | O_WRONLY;
+        if (c->trunc)
+            access |= O_TRUNC;
     } else {
         access = O_RDONLY;
     }
@@ -89,7 +124,7 @@ static int file_open(URLContext *h, const char *filename, int flags)
     fd = open(filename, access, 0666);
     if (fd == -1)
         return AVERROR(errno);
-    h->priv_data = (void *) (intptr_t) fd;
+    c->fd = fd;
 
     h->is_streamed = !fstat(fd, &st) && S_ISFIFO(st.st_mode);
 
@@ -99,19 +134,24 @@ static int file_open(URLContext *h, const char *filename, int flags)
 /* XXX: use llseek */
 static int64_t file_seek(URLContext *h, int64_t pos, int whence)
 {
-    int fd = (intptr_t) h->priv_data;
+    FileContext *c = h->priv_data;
+    off_t ret;
+
     if (whence == AVSEEK_SIZE) {
         struct stat st;
-        int ret = fstat(fd, &st);
+        ret = fstat(c->fd, &st);
         return ret < 0 ? AVERROR(errno) : (S_ISFIFO(st.st_mode) ? 0 : st.st_size);
     }
-    return lseek(fd, pos, whence);
+
+    ret = lseek(c->fd, pos, whence);
+
+    return ret < 0 ? AVERROR(errno) : ret;
 }
 
 static int file_close(URLContext *h)
 {
-    int fd = (intptr_t) h->priv_data;
-    return close(fd);
+    FileContext *c = h->priv_data;
+    return close(c->fd);
 }
 
 URLProtocol ff_file_protocol = {
@@ -123,6 +163,8 @@ URLProtocol ff_file_protocol = {
     .url_close           = file_close,
     .url_get_file_handle = file_get_handle,
     .url_check           = file_check,
+    .priv_data_size      = sizeof(FileContext),
+    .priv_data_class     = &file_class,
 };
 
 #endif /* CONFIG_FILE_PROTOCOL */
@@ -131,6 +173,7 @@ URLProtocol ff_file_protocol = {
 
 static int pipe_open(URLContext *h, const char *filename, int flags)
 {
+    FileContext *c = h->priv_data;
     int fd;
     char *final;
     av_strstart(filename, "pipe:", &filename);
@@ -146,7 +189,7 @@ static int pipe_open(URLContext *h, const char *filename, int flags)
 #if HAVE_SETMODE
     setmode(fd, O_BINARY);
 #endif
-    h->priv_data = (void *) (intptr_t) fd;
+    c->fd = fd;
     h->is_streamed = 1;
     return 0;
 }
@@ -158,6 +201,7 @@ URLProtocol ff_pipe_protocol = {
     .url_write           = file_write,
     .url_get_file_handle = file_get_handle,
     .url_check           = file_check,
+    .priv_data_size      = sizeof(FileContext),
 };
 
 #endif /* CONFIG_PIPE_PROTOCOL */