[FFmpeg-devel] [PATCH] avutil: add av_fopen_utf8()
Michael Niedermayer
michaelni at gmx.at
Sat Nov 2 01:42:58 CET 2013
On Sat, Nov 02, 2013 at 01:32:31AM +0100, Nicolas George wrote:
> Le duodi 12 brumaire, an CCXXII, Michael Niedermayer a écrit :
> > 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;
>
> errno is not set.
>
> > + }
> > + 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;
>
> Ditto.
oops, i forgot saving before git commit --amend
ill post the correct patch after a quick test
[...]
--
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
There will always be a question for which you do not know the correct answer.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20131102/80289e62/attachment.asc>
More information about the ffmpeg-devel
mailing list