[FFmpeg-devel] [PATCH] avutil: add av_fopen_utf8()

[Michael Niedermayer]

fopen() on windows uses UTF-16, we use UTF-8 everywhere, this
function bridges the gap by using avpriv_open()

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
---
 libavutil/avutil.h    |    7 +++++++
 libavutil/file_open.c |   30 ++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/libavutil/avutil.h b/libavutil/avutil.h
index 4692c00..4e680ed 100644
--- a/libavutil/avutil.h
+++ b/libavutil/avutil.h
@@ -313,6 +313,13 @@ unsigned av_int_list_length_for_size(unsigned elsize,
     av_int_list_length_for_size(sizeof(*(list)), list, term)
 
 /**
+ * Open a file using a UTF-8 filename.
+ * The API of this function matches POSIX fopen(), errors are returned through
+ * errno.
+ */
+FILE *av_fopen_utf8(const char *path, const char *mode);
+
+/**
  * @}
  * @}
  */
diff --git a/libavutil/file_open.c b/libavutil/file_open.c
index 389076f..be8f9bc 100644
--- a/libavutil/file_open.c
+++ b/libavutil/file_open.c
@@ -93,3 +93,33 @@ int avpriv_open(const char *filename, int flags, ...)
 
     return fd;
 }
+
+FILE *av_fopen_utf8(const char *path, const char *mode)
+{
+    int fd;
+    int access;
+    const char *m = mode;
+
+    switch (*m++) {
+    case 'r': access = O_RDONLY; break;
+    case 'w': access = O_CREAT|O_WRONLY|O_TRUNC; break;
+    case 'a': access = O_CREAT|O_WRONLY|O_APPEND; break;
+    default : return NULL;
+    }
+    while (*m) {
+        if (*m == '+') {
+            access &= ~(O_RDONLY | O_WRONLY);
+            access |= O_RDWR;
+        } else if (*m == 'b') {
+#ifdef O_BINARY
+            access |= O_BINARY;
+#endif
+        } else if (*m)
+            return NULL;
+        m++;
+    }
+    fd = avpriv_open(path, access, 0666);
+    if (fd == -1)
+        return NULL;
+    return fdopen(fd, mode);
+}
-- 
1.7.9.5