From patchwork Sun Jun 19 11:40:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 36335 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp1099808pzb; Sun, 19 Jun 2022 04:41:21 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uA4u83EdEfFiDgMcYNzLVnPjTjwWMvXulqqsjbanFTyUznNyNGmLQ48SrHbHX34wV/ceFk X-Received: by 2002:a17:907:6d0a:b0:722:b0b5:be69 with SMTP id sa10-20020a1709076d0a00b00722b0b5be69mr2000644ejc.76.1655638881133; Sun, 19 Jun 2022 04:41:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655638881; cv=none; d=google.com; s=arc-20160816; b=C53kLwDnKa9gzXN3YZivaGAOSEP1wv3533sBThIzjvXqFiYBpo00BP0tN6Bhc4gJs7 pCg+0ZyQYinAsg90ioB4ctHwRz/Mrs03IoN3Qery26xgCvzDTPr6+B/QlE47wTUS8ZpB he1WijI3AQy7Z26O8Ty7tlD8vjoFh1ReT16988g88qlsc0hzlSK6CiSe/luVHzqlLnz4 EABx5cKTQi8dCU2qh+j7b4d5kIhKEc8MlqNWyp90/fIaoqIMUEbUcV84dDLAw+9C/BMK OZJa3UgqSRuyoDYxQbzu2t99KaDfZ/oJHGh43pedO5upxThAIiCKuIlO0IEvwZ1qEfQt DbYg== 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=tG6rKQEsTne7YMtGMREEGA18mFfshX0JCuYQ61Ugf/E=; b=d/R3ZhN+ebEdZ2ERKP47+mvywQN3nAJOpeP/18Ii1aNJInRQT7FztUsw3R+Px5XV5g 4Lou8XXNzPZTcvGKK5J7pbSLLbZaHCgaVLgvblw8IrbE8ysaX0REEIVZkvnIi9S2FhqH ielv3JI4Lr23p71h3tUBwV14mRhgN7vpPwfGrQiRxINuJxpjfIM4gB2zFJFQmC9veH1Z rmAA+z/9bbPaygPG99+mzqkO9+WTdSw+7xOMfjdI/Ku1XI2tcEqjo+lrC81/QYUnCKUI ok//KZ9jMmLpGFCtbeWHZghnUpG2HRt21K5R9ncX8TdHo9j3gw106JW9oLRpn4q0x7Ih OAIQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=b86Z2IWL; 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 n19-20020a17090673d300b006fead2c3278si8911011ejl.192.2022.06.19.04.41.20; Sun, 19 Jun 2022 04:41:21 -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=b86Z2IWL; 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 3288E68B3A7; Sun, 19 Jun 2022 14:41:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from msg-4.mailo.com (ip-15.mailobj.net [213.182.54.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E5F9668B333 for ; Sun, 19 Jun 2022 14:41:09 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1655638869; bh=UKkXBovxyvp8LXhqE7X1COXrX6zLrOEIMYq1dnHDybY=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding; b=b86Z2IWL7yurgXpQw9ObowvXe4t0k57E3w+RmNScHVnR1Z5FQ5GGmPJXBDpitJUSO HertusCgrH9lwb5JNU0JmnXZtHsJCJy207RpO65jR+Q2m4g8DwCbXu4/ldnWdyOLo4 RhyGg0Q8y/NmNFmkNrVZkn+aSZwbRczgSAAIAUPo= Received: by b-1.in.mailobj.net [192.168.90.11] with ESMTP via ip-206.mailobj.net [213.182.55.206] Sun, 19 Jun 2022 13:41:09 +0200 (CEST) X-EA-Auth: kqwrDJXfybnY8pr35MHgWVtPmZP9+B2frAiyeJKjlqBigYemEJ72W7g5VVTsNVVT3T2DUTHTqc2SaKPwwo35jqGUAmeienwgD7SmhIz/hp4= From: Nil Admirari To: ffmpeg-devel@ffmpeg.org Date: Sun, 19 Jun 2022 14:40:56 +0300 Message-Id: <20220619114056.5582-5-nil-admirari@mailo.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220619114056.5582-1-nil-admirari@mailo.com> References: <20220619114056.5582-1-nil-admirari@mailo.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v19 5/5] libavfilter/vf_frei0r.c: Use UTF-8 version of getenv() 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: pL/hVl6AT291 --- libavfilter/vf_frei0r.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/libavfilter/vf_frei0r.c b/libavfilter/vf_frei0r.c index f11ae6e55c..c3176ea1f7 100644 --- a/libavfilter/vf_frei0r.c +++ b/libavfilter/vf_frei0r.c @@ -31,6 +31,7 @@ #include "libavutil/avstring.h" #include "libavutil/common.h" #include "libavutil/eval.h" +#include "libavutil/getenv_utf8.h" #include "libavutil/imgutils.h" #include "libavutil/internal.h" #include "libavutil/mathematics.h" @@ -188,7 +189,7 @@ static av_cold int frei0r_init(AVFilterContext *ctx, f0r_init_f f0r_init; f0r_get_plugin_info_f f0r_get_plugin_info; f0r_plugin_info_t *pi; - char *path; + char *path, *env_frei0r_path; int ret = 0; int i; static const char* const frei0r_pathlist[] = { @@ -204,7 +205,10 @@ static av_cold int frei0r_init(AVFilterContext *ctx, } /* see: http://frei0r.dyne.org/codedoc/html/group__pluglocations.html */ - if ((path = av_strdup(getenv("FREI0R_PATH")))) { + env_frei0r_path = getenv_utf8("FREI0R_PATH"); + path = av_strdup(env_frei0r_path); + freeenv_utf8(env_frei0r_path); + if (path) { #ifdef _WIN32 const char *separator = ";"; #else @@ -231,12 +235,17 @@ static av_cold int frei0r_init(AVFilterContext *ctx, if (ret < 0) return ret; } - if (!s->dl_handle && (path = getenv("HOME"))) { + if (!s->dl_handle && (path = getenv_utf8("HOME"))) { char *prefix = av_asprintf("%s/.frei0r-1/lib/", path); - if (!prefix) - return AVERROR(ENOMEM); + if (!prefix) { + ret = AVERROR(ENOMEM); + goto home_path_end; + } ret = load_path(ctx, &s->dl_handle, prefix, dl_name); av_free(prefix); + + home_path_end: + freeenv_utf8(path); if (ret < 0) return ret; }