From patchwork Fri Apr 15 08:07:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 35326 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:671c:b0:7c:62c8:b2d1 with SMTP id q28csp158595pzh; Fri, 15 Apr 2022 01:09:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxZuJ5DDgSBNgl/84ZUdxWpBqWby6igBw+Nfcpg5cgx0DtbgM2tEsVorTJ9biWQOgRr2588 X-Received: by 2002:a17:907:3f91:b0:6d7:16c0:ae1b with SMTP id hr17-20020a1709073f9100b006d716c0ae1bmr5444650ejc.74.1650010143116; Fri, 15 Apr 2022 01:09:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650010143; cv=none; d=google.com; s=arc-20160816; b=sXA8/ARLZ9KKlRPuyKe2aJX/55L0ajyGCgnGH7QIm2/wXJXnyNFeiKgdvtZMR2C7n2 1BzjKzsBH8hjWxX+qz60ONDRiSNZStM9X24OcwJ+UN74GbDN2a4g+Nmpe5YyyZSJHvTa eWZHzFWw9PsyrZM+/9/ExVJkk1gKxYinL+pZ8ntnXqj19e5CLi0aFgYitqqEthStYACY efF8+VKLbqNVhIZpGuqvnQ0aNgRIznmFEm1uRFCn6mYOiNd3gFK9V2Yl7aqz4wHZnu08 RmRxRD7JkQ2NWsAkSBW3YsrWMKkdfHzGWP7AuANSi9HIvpfXURTmeozlmpjqctzzKhhJ VDNw== 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=WTn6VaeIewDh0pOIKdXcALjmtOzeZsjbxlIdghbMeyE=; b=hpe2wtCod+Hd2Xi4fjFcaJYMrYzc/NK6nfHiFhrm8Nz5Cg5ZXv3r7FDENarn+qk0Wx mo4T+hg425TqBjDVi4USW3UzcDQCYhy5V2GG0lkZpMAewqqDZz/BTZtYhCuGVv0hcMjR lcBLSpeautGacQLZ+/lNBO1HAlcvk74BeqZRi7JOH1KEK9jEUYn0vrqbn4NMRuuFcHH7 qLTnlYTYrKOAjy3/ov4r/+xl3oWSejh5WDIhtzVnVVzdLnF9rbN0XDrQ65npJYuwaMU8 B/YHqGy4rewYXgDsL+c675n2Trpdcl6+XuDn2VyrBjhtcx0axhtoqt5XiDL5Cc93hhyU fbdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=jX2IyVSy; 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 x7-20020a170906804700b006e83256d4bfsi570571ejw.555.2022.04.15.01.09.02; Fri, 15 Apr 2022 01:09:03 -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=jX2IyVSy; 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 293A468B3EE; Fri, 15 Apr 2022 11:08:25 +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 4461868B3F9 for ; Fri, 15 Apr 2022 11:08:15 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1650010090; bh=QKx5E0dog0Ovl5yxrkRRkbDMH5JiS1ut7JCb6ad42go=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding; b=jX2IyVSyrTmuMdrp1a2Y4OCZW3Z6nKy0rvGh1rzrjlv+qdPTDO1+Zw0mNzd9QtDVB gw26+5HJVigM8zPKE+2c/boT3kjR01PAOhjZaNNGqvQmT8jUqmc1nXSztsgCleCnSB FJFCbEU7Eg2g3w7mapCdmjEUuKWjEVX1W+E1lIAk= Received: by b-3.in.mailobj.net [192.168.90.13] with ESMTP via ip-206.mailobj.net [213.182.55.206] Fri, 15 Apr 2022 10:08:10 +0200 (CEST) X-EA-Auth: ckEQmISqbgl8Zvi0aLeiI7k05t7NiiP/+cUp+fGEVAE6U10J1B2IB5qu81R70EDB3hgJzBars0b5hrfozcUkWAIg58kCwDtrJ828lyUF7oM= From: Nil Admirari To: ffmpeg-devel@ffmpeg.org Date: Fri, 15 Apr 2022 11:07:46 +0300 Message-Id: <20220415080748.18517-4-nil-admirari@mailo.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220415080748.18517-1-nil-admirari@mailo.com> References: <20220415080748.18517-1-nil-admirari@mailo.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v9 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: H+/BkIWdANrU --- 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 +#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; }