From patchwork Mon Jun 13 16:26:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 36198 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp586842pzb; Mon, 13 Jun 2022 09:27:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzsWwCIP3EPd6j6MbyxnR9uUwRvQn5RD++sTdQmiLYNQO4MXjCwWivhbocAe18s8QZ7Yjvw X-Received: by 2002:a17:906:739a:b0:713:3ac7:976f with SMTP id f26-20020a170906739a00b007133ac7976fmr588205ejl.22.1655137634738; Mon, 13 Jun 2022 09:27:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655137634; cv=none; d=google.com; s=arc-20160816; b=E3Dy3X+7GGqUQAJEhdKt8Cp8AX7QmjsYlBeupGFPEyFs7ncb3gspBUJLhWN4AmR7k/ 6A091eMwXLzhobEg5Ge78HWQJykmulLELgff5DkvLPmpY6j2s8joMOcY4cb39joCzHwd 1LcUCWzE1Y82eZ/SVElIkBzSYnjUaLLbCZpgsb7laFza2hhfVhGIrcmR/iyOIh+c+HPL s68nN5seuhytJljXHCwHJ0Kyx0r9pIsV2Vm5CkCRYe8wLSy0H8m5wLRXtCQFij1rw30j QC3bA24HYD2p+drjYW1rQmIRt/xMjqC3Rr4DXjeyCN1eW8HSguWLkUgdMI17Ms6l6uhY lb3Q== 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=NSYpHhyPH1hBFrK1wT/i11HCVYTQtJBi4sk7R5Yecuu8bS0EBxE5ZvsmLGnN+5QNlo Vhc4dKFzuKy/UIrUlpUmLVvN6EibifBL0ARmNiFCqjvWx4F/KgjTBT9WSVWq7RN5aKuu 4R+8JbEfNds0ODyzDFIV7Z28rcwl5LjjTzpURh7wCcJJkZf6ADynri1bKc8baufw9YhI klB0DU1IHg4UV8s+PZoXz9Pqg1hArLo/axtOaA1ssjZgnIMcV31izd9akP6RRZM/hybF p7Iajx7Owv8FtwTtjDB6wHnzF45uHmOs6Wz7RGlX0KJcCou6YWZdYlLxndAluiWH2FVM p2QA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=O1MwG4a7; 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 w18-20020a05640234d200b0043167ed96dcsi9913707edc.8.2022.06.13.09.27.14; Mon, 13 Jun 2022 09:27:14 -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=O1MwG4a7; 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 A1EEE68B5FB; Mon, 13 Jun 2022 19:26:49 +0300 (EEST) 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 BCDA468B5B0 for ; Mon, 13 Jun 2022 19:26:40 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1655137599; bh=p9jxFt4rVMw7lLn6uKQfLHnRCrr8GugwXB91pqjkC1Q=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding; b=O1MwG4a73ahB0V5/eIAvH5TuIAefYTpNw7axDz0559ExklAs9aNg9xMbDfuUi2YHx uk3u2WWUQObEufwKFUVZQS2vZkr1g/SwSvRyl71d0+0ni1AZjmAPbgHufIrTbobyBi hDKiLuQuyotN1cSF7spOPR0tfYboVVsVrd2hX8ZM= Received: by b-1.in.mailobj.net [192.168.90.11] with ESMTP via ip-206.mailobj.net [213.182.55.206] Mon, 13 Jun 2022 18:26:39 +0200 (CEST) X-EA-Auth: XSp3GX+JTWu+98ThkHnz7Tk/JBw2VdzjsiS+QXu/jZXsc8kNdMlf1sZEw46HqUf7+O1b+IzES87S70GrBdQLRVZwlZft/yLoqaR7lxN7iG8= From: Nil Admirari To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Jun 2022 19:26:26 +0300 Message-Id: <20220613162626.11541-5-nil-admirari@mailo.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220613162626.11541-1-nil-admirari@mailo.com> References: <20220613162626.11541-1-nil-admirari@mailo.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v14 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: SXP6SefifRww --- 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; }