From patchwork Sat Feb 19 09:56:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 34406 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp1692410nkx; Sat, 19 Feb 2022 01:57:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJwp+lan9PetZ6rk1LHBkYcWCmQco0dkluskv6Hen0f78HanpePzR0oNa6IngvG3+AK/BEIA X-Received: by 2002:a50:ee90:0:b0:40f:349f:7368 with SMTP id f16-20020a50ee90000000b0040f349f7368mr12053681edr.236.1645264645268; Sat, 19 Feb 2022 01:57:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645264645; cv=none; d=google.com; s=arc-20160816; b=m5l79spTsCvZ6c28ePwuz4RwRKYZ1aQzUXLsvOy2+XdL4y81A696MdeniFPjtjBr2w 2WHG8rMKXXPO3ujn+R0Erosz3HtaLcwmTYkVTEU7TCgQSJpoPpmnnvMzWuA0RLRSsRD2 OcTfENODe2LQsOgMugJOA8rCmkrhyBpBRVCTarFLobsnwuRUs7NJwbvhoyEe4BJZmemz JbQprQwCR85rUF3vUy2Z25I3TCOTrRAHr3Ifml4TvIJGQjRIREl/VlwaFG7cg8/5TWXR Qn7QYZMmJcPcleuTJ2bUQoJYrTO0BPEg2Q9F63+SmdCv2cCMBSJcmmqF2SOVvzzvL5mL 1+8w== 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=TRmDstopPVvrKuH49EakUzr2gJiWNGXlmjBEfDTf3Bo=; b=jHPefu9/ZkjYRIS3IryzwjakY5d1lamuT+niJK1WFeYbku2vNgeDMO1JuYiO6IV262 AOcYo8Tp85I1j1fnSuHxJ9awU+L4Qq6lJyKZS5xxoV1Ona1QkRu1JoCQon1QjyPRnryw ncFLvp/E4qFhJKffuyAQPqJIAkDX3ZiepSJ/dkLwmvpClrGWT5br/regirgxXttXGwOv tBlmTZtQvagdcDWjKTrvl7etchD3OCY87A0npg4oMdCS6LboE/19EarNwWg1FCOLMSet EWJ+CqhqJLJsC3gd38b2eoxqxVs93LVk7ZdT/zpEIkTr4IqQ1LVAybMkmOaCihaiYy6S 9FBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=Lgy9RwCN; 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 n26si1008634ejr.817.2022.02.19.01.57.24; Sat, 19 Feb 2022 01:57:25 -0800 (PST) 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=Lgy9RwCN; 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 A33B668B164; Sat, 19 Feb 2022 11:56:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from msg-1.mailo.com (msg-1.mailo.com [213.182.54.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2D53368B058 for ; Sat, 19 Feb 2022 11:56:43 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1645264598; bh=H8HJIYiw1HvIFkXRKR1L0BymRute8G9cxtVjIwJwhE8=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding; b=Lgy9RwCNsevAEbiDxldtuYMEyHKPPOiNr905nyt4V1YWcdLC5Tddljx30e3jbuhzt tXpdJIeIerlku4Mfaet798Vg6jkmK+v688Te//xujdcSd9wWTWOhsP/QGhnEn/YwRg Zznvdk9UnCF8agbzHWTIPXtwO6sfrAkC6058fkyU= Received: by b-3.in.mailobj.net [192.168.90.13] with ESMTP via ip-206.mailobj.net [213.182.55.206] Sat, 19 Feb 2022 10:56:38 +0100 (CET) X-EA-Auth: XM0Lrp0mFq7tKwazQC9RnLAKGwtVHTprgfkrQj8bWNgnCFgc3JO73Rbg722S7jckT1L2Addag9/HMJcV02s/NKaoGZjqBBnk4gzdI9QpNqA= From: Nil Admirari To: ffmpeg-devel@ffmpeg.org Date: Sat, 19 Feb 2022 12:56:21 +0300 Message-Id: <20220219095623.9417-4-nil-admirari@mailo.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220219095623.9417-1-nil-admirari@mailo.com> References: <20220219095623.9417-1-nil-admirari@mailo.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v7 4/6] fftools/cmdutils.c: Replace MAX_PATH-sized buffers with dynamically sized ones, and 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: a+wpD0ZurklR --- fftools/cmdutils.c | 40 ++++++++++++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 4b50e15..e87601e 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -40,6 +40,7 @@ #include "libavutil/attributes.h" #include "libavutil/avassert.h" #include "libavutil/avstring.h" +#include "libavutil/avutil.h" #include "libavutil/bprint.h" #include "libavutil/channel_layout.h" #include "libavutil/display.h" @@ -62,6 +63,7 @@ #endif #ifdef _WIN32 #include +#include "compat/w32dlfcn.h" #endif static int init_report(const char *env); @@ -1032,7 +1034,7 @@ static int init_report(const char *env) if (!envlevel) report_file_level = FFMAX(report_file_level, prog_loglevel); - report_file = fopen(filename.str, "w"); + report_file = av_fopen_utf8(filename.str, "w"); if (!report_file) { int ret = AVERROR(errno); av_log(NULL, AV_LOG_ERROR, "Failed to open report \"%s\": %s\n", @@ -2065,28 +2067,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 int datadir_len = ls - datadir; + const int 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 @@ -2095,17 +2112,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; }