From patchwork Fri Feb 18 18:34:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 34387 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp1187052nkx; Fri, 18 Feb 2022 10:35:39 -0800 (PST) X-Google-Smtp-Source: ABdhPJxsv9BIhXFNWQvAIw/9EyALx2M5cPzxbvbbI0yhA650PuVkupkO0oexSyXODg2+qGPE/QDB X-Received: by 2002:a50:d085:0:b0:405:6747:ea68 with SMTP id v5-20020a50d085000000b004056747ea68mr9364897edd.410.1645209339024; Fri, 18 Feb 2022 10:35:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645209339; cv=none; d=google.com; s=arc-20160816; b=E9MlMlOV0n+FzV2gplkY2XUHob3UiEGtznENpkFwaB6t+H17WOHTUtKmgyxoozp3/Y BcSzKWES79GCRdSFg+zAfOOv5HPeK5V220Go8LdXeJi96mlYebiB3OMxDHzEWHUrIzbu 886EMcR61rPqkhHz9CgsD30Wj/Am1YZ/fOvKjhQAfjXhT/G4zy09VAb+BtdHZkZt4d7H 4jg4VkkZtY/xuL/cI3IFGkc9tMoqjRSSLnB47+iwR5iPZNA1XLqcaqxGui6w/20zey6S IpjeMnoWLTfNhXoXlLP8q4LGpjTCUirz6qp69a9ZCe+kTX4yo20Zdp9j9rjYQXbLv4Hw H81w== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=MABY2sERUPHoszs9VPL6ClUNuHj+2YtsINO/6QOouZU=; b=VDLKbgZgZvFd/oU+3GiuOcEGBNCSVzpFaMmP36M8ML73CEDMkJ6RnY5dUgteFvuN7r eaGeCCiCVScbR4sD4NkhvzsnNhDylVPrrGoboFzCQDwLtNedqz7gKNW0WK9YdnSUISxg FJeGw6MTa89RgmjjZLvKakK4n/NYHtkgmU1UWLHjwfF1QnvWdsfDFlSF8ClLVj7vPoSy YHQBouKsoy3MFXWJehEjA9DcvjTpLl9B85xkm5EOqrSgYWaMYEzkwKPWTYCWAeuFWRga vdjEhyOrxxGMSFUWbx3cjsbf9frwH1Iw4jGntgeLd3IllaIrZ+YaBK0VUSMwC9J6m6ws xOcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=Vel+SRAN; 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 w4si2600165edr.487.2022.02.18.10.35.38; Fri, 18 Feb 2022 10:35:39 -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=Vel+SRAN; 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 5309068B18F; Fri, 18 Feb 2022 20:35:05 +0200 (EET) 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 754F668B08F for ; Fri, 18 Feb 2022 20:34:55 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1645209288; bh=r1IehPVeYpWe/29923wliDsg4mk6Oc/1SNiPqmEL74s=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:MIME-Version: Content-Transfer-Encoding; b=Vel+SRAN9LNh3sEH0gIJgWtalZrRKQu/oRObKtDBajKRdCECVYU9FJPq+75n1FSXG FEbMZXHYa/cspylhZGxRr3J8S89JuAIW2Nw/wKiA7QjoqcIDkyjsJpwaHf153/xbol LL//0WOo5m+mVAFlRG6Jp/fh45RGVmvvNXqirLMA= Received: by b-1.in.mailobj.net [192.168.90.11] with ESMTP via ip-206.mailobj.net [213.182.55.206] Fri, 18 Feb 2022 19:34:47 +0100 (CET) X-EA-Auth: Nh20CATD9iMge/fGVP+gakNTbTVAzy/spCizOofMJ85RpFUfyMXXOHPCM/eENU+rNIxO76ovaS/yXxXVs3saiDzQ1r2m65JoyokPW+TQUHk= From: nihil-admirari To: ffmpeg-devel@ffmpeg.org Date: Fri, 18 Feb 2022 21:34:31 +0300 Message-Id: <20220218183436.14050-1-nil-admirari@mailo.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 1/6] libavutil/wchar_filename.h: Add wchartoansi and utf8toansi 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: kgH6JkZhWRAH These functions are going to be used in libavformat/avisynth.c and fftools/cmdutils.c when replacing MAX_PATH-sized buffers with dynamically sized ones. --- libavutil/wchar_filename.h | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/libavutil/wchar_filename.h b/libavutil/wchar_filename.h index 90f0824..32260a4 100644 --- a/libavutil/wchar_filename.h +++ b/libavutil/wchar_filename.h @@ -40,6 +40,43 @@ static inline int utf8towchar(const char *filename_utf8, wchar_t **filename_w) MultiByteToWideChar(CP_UTF8, 0, filename_utf8, -1, *filename_w, num_chars); return 0; } + +av_warn_unused_result +static inline int wchartoansi(const wchar_t *filename_w, char **filename) +{ + const int num_chars = WideCharToMultiByte(CP_THREAD_ACP, 0, filename_w, -1, + NULL, 0, NULL, NULL); + if (num_chars <= 0) { + *filename = NULL; + return 0; + } + *filename = (char *)av_calloc(num_chars, sizeof(char)); + if (!*filename) { + errno = ENOMEM; + return -1; + } + WideCharToMultiByte(CP_THREAD_ACP, 0, filename_w, -1, + *filename, num_chars, NULL, NULL); + return 0; +} + +av_warn_unused_result +static inline int utf8toansi(const char *filename_utf8, char **filename) +{ + wchar_t *filename_w = NULL; + int ret = -1; + if (utf8towchar(filename_utf8, &filename_w)) + return -1; + + if (!filename_w) { + *filename = NULL; + return 0; + } + + ret = wchartoansi(filename_w, filename); + av_free(filename_w); + return ret; +} #endif #endif /* AVUTIL_WCHAR_FILENAME_H */