| Message ID | 20220415080748.18517-4-nil-admirari@mailo.com |
|---|---|
| State | New |
| Headers | show |
| Series | [FFmpeg-devel,v9,1/6] libavutil/wchar_filename.h: Add whcartoutf8, wchartoansi and utf8toansi | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
On Fri, 15 Apr 2022, Nil Admirari wrote: > --- > fftools/cmdutils.c | 38 +++++++++++++++++++++++++++++--------- > 1 file changed, 29 insertions(+), 9 deletions(-) > > diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c > index 5d7cdc3e..a66dbb22 100644 > --- a/fftools/cmdutils.c > +++ b/fftools/cmdutils.c > @@ -37,6 +37,7 @@ > #include "libswresample/swresample.h" > #include "libavutil/avassert.h" > #include "libavutil/avstring.h" > +#include "libavutil/avutil.h" > #include "libavutil/channel_layout.h" > #include "libavutil/display.h" > #include "libavutil/mathematics.h" > @@ -50,6 +51,7 @@ > #include "opt_common.h" > #ifdef _WIN32 > #include <windows.h> > +#include "compat/w32dlfcn.h" This adds a dependency on nonpublic headers - which I think can be tolerated as it's only a build-time issue, and fftools are currently built as part of the rest of the ffmpeg build anyway. > #endif > > AVDictionary *sws_dict; > @@ -812,28 +814,43 @@ FILE *get_preset_file(char *filename, size_t filename_size, > { > FILE *f = NULL; > int i; > +#if HAVE_GETMODULEHANDLE && defined(_WIN32) > + char *datadir = NULL; > +#endif > const char *base[3] = { getenv("FFMPEG_DATADIR"), > getenv("HOME"), Hmm, I guess neither of these are commonly set on Windows - otherwise this would suddenly change to interpret generic environment variables as UTF8. > FFMPEG_DATADIR, }; > > if (is_path) { > av_strlcpy(filename, preset_name, filename_size); > - f = fopen(filename, "r"); > + f = av_fopen_utf8(filename, "r"); > } else { As mentioned elsewhere, I realized that av_fopen_utf8 is problematic, but that's an orthogonal issue, and the issue is already preexisting, and it's used for a fairly marginal feature here, so I guess that can be tolerated too (and if the root cause is fixed, this gets taken care of at the same time too). // Martin
> > +#include "compat/w32dlfcn.h" > This adds a dependency on nonpublic headers - which I think can be > tolerated as it's only a build-time issue, and fftools are currently built > as part of the rest of the ffmpeg build anyway. Currently the header consist entirely of static inline functions and macros. If it's not OK to use it here, please suggest a better place for get_module_filename(). > > const char *base[3] = { getenv("FFMPEG_DATADIR"), > > getenv("HOME"), > > Hmm, I guess neither of these are commonly set on Windows - otherwise this > would suddenly change to interpret generic environment variables as UTF8. > > ... > > As mentioned elsewhere, I realized that av_fopen_utf8 is problematic, but > that's an orthogonal issue, and the issue is already preexisting, and it's > used for a fairly marginal feature here, so I guess that can be tolerated > too (and if the root cause is fixed, this gets taken care of at the same > time too). Reverted back to fopen().
diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 5d7cdc3e..a66dbb22 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -37,6 +37,7 @@ #include "libswresample/swresample.h" #include "libavutil/avassert.h" #include "libavutil/avstring.h" +#include "libavutil/avutil.h" #include "libavutil/channel_layout.h" #include "libavutil/display.h" #include "libavutil/mathematics.h" @@ -50,6 +51,7 @@ #include "opt_common.h" #ifdef _WIN32 #include <windows.h> +#include "compat/w32dlfcn.h" #endif AVDictionary *sws_dict; @@ -812,28 +814,43 @@ FILE *get_preset_file(char *filename, size_t filename_size, { FILE *f = NULL; int i; +#if HAVE_GETMODULEHANDLE && defined(_WIN32) + char *datadir = NULL; +#endif const char *base[3] = { getenv("FFMPEG_DATADIR"), getenv("HOME"), FFMPEG_DATADIR, }; if (is_path) { av_strlcpy(filename, preset_name, filename_size); - f = fopen(filename, "r"); + f = av_fopen_utf8(filename, "r"); } else { #if HAVE_GETMODULEHANDLE && defined(_WIN32) - char datadir[MAX_PATH], *ls; + wchar_t *datadir_w = get_module_filename(NULL); base[2] = NULL; - if (GetModuleFileNameA(GetModuleHandleA(NULL), datadir, sizeof(datadir) - 1)) + if (wchartoutf8(datadir_w, &datadir)) + datadir = NULL; + av_free(datadir_w); + + if (datadir) { - for (ls = datadir; ls < datadir + strlen(datadir); ls++) + char *ls; + for (ls = datadir; *ls; ls++) if (*ls == '\\') *ls = '/'; if (ls = strrchr(datadir, '/')) { - *ls = 0; - strncat(datadir, "/ffpresets", sizeof(datadir) - 1 - strlen(datadir)); - base[2] = datadir; + const ptrdiff_t datadir_len = ls - datadir; + const size_t desired_size = datadir_len + strlen("/ffpresets") + 1; + char *new_datadir = av_realloc_array( + datadir, desired_size, sizeof *datadir); + if (new_datadir) { + datadir = new_datadir; + datadir[datadir_len] = 0; + strncat(datadir, "/ffpresets", desired_size - 1 - datadir_len); + base[2] = datadir; + } } } #endif @@ -842,17 +859,20 @@ FILE *get_preset_file(char *filename, size_t filename_size, continue; snprintf(filename, filename_size, "%s%s/%s.ffpreset", base[i], i != 1 ? "" : "/.ffmpeg", preset_name); - f = fopen(filename, "r"); + f = av_fopen_utf8(filename, "r"); if (!f && codec_name) { snprintf(filename, filename_size, "%s%s/%s-%s.ffpreset", base[i], i != 1 ? "" : "/.ffmpeg", codec_name, preset_name); - f = fopen(filename, "r"); + f = av_fopen_utf8(filename, "r"); } } } +#if HAVE_GETMODULEHANDLE && defined(_WIN32) + av_free(datadir); +#endif return f; }