From patchwork Fri Jun 17 09:31:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 36294 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp23601pzb; Fri, 17 Jun 2022 02:32:26 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vKy9QZQtiMt7E16L5kBH595lqH0InwY73r6gvIfEmBaw2OCHNbRH1Hi4sT5R8SiZkVmCuc X-Received: by 2002:a05:6402:4498:b0:435:1fb8:23dc with SMTP id er24-20020a056402449800b004351fb823dcmr11289501edb.310.1655458346152; Fri, 17 Jun 2022 02:32:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655458346; cv=none; d=google.com; s=arc-20160816; b=zGXyNmC6r33TNH5+nGYYfv4SOYfUIaGboPtCGBWZt/o+a11hZ2S4/lLV5NClniqm3d lzpaDaJlMeU4mZ34xgRTTTZBBBG0VRvXNMiz0KKQHJxv4lU5DImOHecYi57g1jpNtF11 TxLGbMtub42zIzMN6WB3OlFhiXQiDnIUJiZt0vwVk62Nf8zFH4XdugsL+QS1PU3D0tp+ LKfK3KwzBpUFE0zt6kiVK11l0iw+JIs2fycUGRLQgqVmla3eptx0y5jNbKxRN1estX4J P1NseRJisqxpNC2k6RjVF5hdd1RKDpkr1SMKS2hHtPfjzKCuVcFLniCu054Lr3lBniFE /TzA== 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=wck5Gh3tZJ45YiVREwz/p0oiAQ/bs6B/1JICiOazkZ8=; b=WZikHIM6y0Sy9lJ2f8AMP1CdvgX3fxbZmnE/woObNr3rUhuh9JW8RBmArf60xDmXsq dD46uDmzNozfnn2e/2IcUNFLDnmsmmEl+5MJVUmsRA3BNa17wnVRVg3Zq1TbPg3homXi h3nkkIhYTnwPvmJE/pFwm+lp6JF7hyyhUP7/Zr1octTe7dQ0Z+/a7Nklwb09LCKHFEHk k+41pB/ohV8H4uHyVFMW3Cbu/n5gJwyKmy+48+I4KnCsFTInVtYHX19IWOZyotBVAuSO 62oAFpsuJ6a1pXWLZISLKRgy2kH2R34FYO0HJ/ZlGE4o0aW0c6yiJqtVNyjhG+9vGBhD ojEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=S5r9j2dw; 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 l4-20020a170906794400b0071076a14dc5si4111952ejo.774.2022.06.17.02.32.25; Fri, 17 Jun 2022 02:32:26 -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=S5r9j2dw; 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 C457468B889; Fri, 17 Jun 2022 12:32:01 +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 968A868B7CF for ; Fri, 17 Jun 2022 12:31:54 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1655458313; bh=p9jxFt4rVMw7lLn6uKQfLHnRCrr8GugwXB91pqjkC1Q=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding; b=S5r9j2dwzqI3Se+x8HLGKd2gZTqss/bR92uKCNlSNm7PyujajbeKzT1EL4IRs5kmX vz7AZeZmstqcK+UtMimYWRl+mp4rqNWx1uVMREWPYi5uXhOOUv+H1iLCFey0I77V5M DQsBjLOaqR+oZysKdFBDQ6IGjuA/bVqwRlDBv8tE= Received: by b-3.in.mailobj.net [192.168.90.13] with ESMTP via ip-206.mailobj.net [213.182.55.206] Fri, 17 Jun 2022 11:31:53 +0200 (CEST) X-EA-Auth: e9yj4excOlBeJ4SXMaeUOJHn0PQzfKtefd6F710IWAbK7lc94C0r253X7Dzx/TSphPiMbdfaa7KXr52ETqHBWxlalznFHXFUCdEusYlNpk0= From: Nil Admirari To: ffmpeg-devel@ffmpeg.org Date: Fri, 17 Jun 2022 12:31:41 +0300 Message-Id: <20220617093141.9826-5-nil-admirari@mailo.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220617093141.9826-1-nil-admirari@mailo.com> References: <20220617093141.9826-1-nil-admirari@mailo.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v17 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: TKTaFdVD8tu9 --- libavfilter/vf_frei0r.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/libavfilter/vf_frei0r.c b/libavfilter/vf_frei0r.c index f11ae6e55c..727e96561a 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" @@ -204,7 +205,7 @@ 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")))) { + if ((path = getenv_utf8("FREI0R_PATH"))) { #ifdef _WIN32 const char *separator = ";"; #else @@ -231,12 +232,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: + av_free(path); if (ret < 0) return ret; }