From patchwork Mon Mar 28 20:43:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 35030 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c05:b0:7a:e998:b410 with SMTP id bw5csp524916pzb; Mon, 28 Mar 2022 13:44:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzNcLEPIaHCsgvtJEKtYl3gAKJ4HQ+sDdeA5Rpd20jbCxY3GDNfM/s1iOOjmF/7iesRXLVg X-Received: by 2002:a05:6402:1912:b0:418:cd23:3742 with SMTP id e18-20020a056402191200b00418cd233742mr18639942edz.412.1648500280746; Mon, 28 Mar 2022 13:44:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648500280; cv=none; d=google.com; s=arc-20160816; b=egcMT8WFnHsmGDpW/F4pd+j9JXA2Fq9+BRj6cynuTQQVJhhwk4B9+P7f65gJ7IFmzk P6E8BDlP/gbwaIvOxaHM2L5CAg9m1xsfqIF3LWOipBSVQghHxgAorFmwnq58BM2BWhdJ Fe7P0UESkQ9RzVpLOySdounnhwX7Zcf8E85hzGKCt0dVRv22J7jOOSNAOB1yb5Upj02b b75UmjqjWb2yeF5ZE7DzEUNAD2LMK6vyvahqJ/IZJf8vwFPvst5H29z2fjHTzLVv6qE/ J/a8ehAvNbw1UVUFXWbj0Ual6TRhfA4wfs2SlnnW1xPfc/VLKlx8mjwTyNemtmiH9/m2 Ti4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=aACj8yrSXs6yxRvGAQcf1POJge3x/2WbSzX109xg6dQ=; b=oQJ3yhlPlQ64QrClk061syv8CtGG8qMP0nBcn0AJcSkyh2XSizlfGClJ9fm248LnKq VN5i1CjOxar8GMtpfAoPQcwDbwW1aP+uepEKRxUSlet8jX6hK0gS6+ZNswfMKLValRkC VquillXq0UFShQCHJl3PN5kszieOoLMiWY19+M8Iy2M8UkYNiXVmUKgS1ybmfIYUK4Ei 5ChpEm0ePVT+Aoa2n/k6z4th3udC5SY4kznL3weEsNIC8anJzXbTim79x+8lT/9pVvL5 knz/jl6DwSqqeS6W0DIGbdV7Eq12ztuDqzZJY1r16tyzMBTCyWY/TdxkIbUKje0NrMyf JCMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=mHMSfyEv; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mailo.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ej21-20020a056402369500b00418d882fc85si13186085edb.141.2022.03.28.13.44.40; Mon, 28 Mar 2022 13:44:40 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=mHMSfyEv; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mailo.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AF97C68B2B5; Mon, 28 Mar 2022 23:44:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from msg-6.mailo.com (ip-16.mailobj.net [213.182.54.16]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 14EAD68B1FB for ; Mon, 28 Mar 2022 23:44:02 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1648500236; bh=5M2zruBSTAas3ys6Dr4fAv5PUfnkDkvpHI0ZX23xqpc=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding; b=mHMSfyEvNuNZfRMEl3On05VBRpZBIYpkrdMgX/6CaQdyJvL8FxP+y4rb1msp4A5zd u9ibFIMy6qlu7mUS2kdukgCfkAfD9LgcfFj2LP7g0FmM7b67Fa0ycmQHZg2YWQWyCU tH482tc1DKgaU0Ut4nRB/D2IJWbiXRfiTSfZGqbE= Received: by b-6.in.mailobj.net [192.168.90.16] with ESMTP via ip-206.mailobj.net [213.182.55.206] Mon, 28 Mar 2022 22:43:56 +0200 (CEST) X-EA-Auth: 3DU20WqIC2OQbKbHh6X59y7VJZxMReUpJk7CeHvafhRrcSpcOxbvZBirupNaKbuHQKHCoUI9+vmco3RUDb9DfILy0OBRrguXZUJ2U51jMwA= From: Nil Admirari To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 Mar 2022 23:43:37 +0300 Message-Id: <20220328204339.13009-4-nil-admirari@mailo.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220328204339.13009-1-nil-admirari@mailo.com> References: <20220328204339.13009-1-nil-admirari@mailo.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v8 4/6] fftools/cmdutils.c: Remove MAX_PATH limit and replace fopen with av_fopen_utf8 X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: s+eXFM6JjEAU --- fftools/cmdutils.c | 38 +++++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 5d7cdc3..a66dbb2 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 +#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; }