From patchwork Sat Feb 19 09:56:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 34403 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp1692131nkx; Sat, 19 Feb 2022 01:56:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJxG6iNzghGZuY5aLLljre2g1DChlq3vvDxnbfvnH9GzSWChofLRJSIlQMEQ1I6wZDN6Dez8 X-Received: by 2002:a50:ba8e:0:b0:410:a99c:4c3b with SMTP id x14-20020a50ba8e000000b00410a99c4c3bmr12442230ede.427.1645264614969; Sat, 19 Feb 2022 01:56:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645264614; cv=none; d=google.com; s=arc-20160816; b=in5KfK2EQzvM15tRus6l5NjT6h5Ild4ItlX68PI32RG2WDseYr7WQCcVyyQUOzTk/K GGM4GiOMJK2XgOJ0tJEhVdTIq5+kgFqkOD9GMCfWNz1ALQEjV2rHrbBWIsiZumxdMhHl m+vy4VbOBOTUQdXOD5wNMoE90/iqYgRPNr26UmgVmwB10D/sOzvMHV9kif3Iw4MtM9lp L3vlkgTJ3MDRxig6q37RcYUPBEKdLsbfDjkL2h+J/U03FNKihNtg1imXX1zbLPKeVr0W Au2XYC78Iqf5VxdLKCJblNT10YSpn37NzC5385LjgJLhU4OmgDAs/Rds1Ac5+TXxzNPs LlHw== 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=1KcIWr7vXotbkYbg0td7z4JAj73xsqvOMvue1ynC3o0=; b=PsDxgOByzmJbM2hKGY4CYtlONsbnAfxBX+9VdkB86yD+ADs+xq6s4HAf1hQ8tvKYWm NN6oJQRJFV0ykTVnjHs+8fsh+X7PfjZX6OSiq02OSp8kp5yfv5UQcc+j0dXhdz0ZI6iA cYJM80wfso29y/Yy+MIcwUXMQ9KwmOygmao2DYQpt5fKR+HbGvrEiHPP3Vk8bmxBpSfU HH9xob9i/9J3Y5yM3y8/QybSVKnxxAlbf0WhzykaYUSwT8E57f0ligIgtUeVakHs7KD0 svi7wBrm2aItzeqGy0zx2rCEoj7+beJ3fhB4rl83oiclxHYQ56Gh8KxaSjTERs5o8lml DJzA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b="HeL/Iq4Q"; 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 bg9si5442518ejb.460.2022.02.19.01.56.53; Sat, 19 Feb 2022 01:56:54 -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="HeL/Iq4Q"; 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 59C9268B11A; Sat, 19 Feb 2022 11:56:49 +0200 (EET) 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 2A79068AFDC 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=1645264595; bh=UaTF/ZFNf+TaWxTnXLeNinfxMIrGgRvkXoYlUt+N8Kg=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:MIME-Version: Content-Transfer-Encoding; b=HeL/Iq4QPbHRrNEyqKPb2YxwdAb2n/Kc6Yc2wl/QGjp0WSxg6wKSghsKwPXjZyb3T FqUYycv31bKKKabvWZL9qH/3RpAm4XYUwkiSJOlsbzP5U/K/kJ3hhtwFcnjDKHf10F MfkvIDUspXHUy/S+qYZKywS/Wef5CsfgDtaXY2eg= 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:35 +0100 (CET) X-EA-Auth: WZqTcCopBqSCZuhkcwe1UMzAc625T7x6vS9L88/5njpa1+QtOC/QgE1oz5EBuSFJFQaR9a43Omc+quR1YMNU/ODeIeEHIPLOl8slb8qOhDM= From: Nil Admirari To: ffmpeg-devel@ffmpeg.org Date: Sat, 19 Feb 2022 12:56:18 +0300 Message-Id: <20220219095623.9417-1-nil-admirari@mailo.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v7 1/6] libavutil/wchar_filename.h: Add whcartoutf8, 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: IYbAdJ3PEnlE 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 | 51 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/libavutil/wchar_filename.h b/libavutil/wchar_filename.h index 90f0824..70cd5a4 100644 --- a/libavutil/wchar_filename.h +++ b/libavutil/wchar_filename.h @@ -40,6 +40,57 @@ 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 wchartocp(const unsigned int code_page, const wchar_t *filename_w, + char **filename) +{ + const int flags = code_page == CP_UTF8 ? MB_ERR_INVALID_CHARS : 0; + const int num_chars = WideCharToMultiByte(code_page, flags, filename_w, -1, + NULL, 0, NULL, NULL); + if (num_chars <= 0) { + *filename = NULL; + return 0; + } + *filename = av_calloc(num_chars, sizeof(char)); + if (!*filename) { + errno = ENOMEM; + return -1; + } + WideCharToMultiByte(code_page, flags, filename_w, -1, + *filename, num_chars, NULL, NULL); + return 0; +} + +av_warn_unused_result +static inline int wchartoutf8(const wchar_t *filename_w, char **filename) +{ + return wchartocp(CP_UTF8, filename_w, filename); +} + +av_warn_unused_result +static inline int wchartoansi(const wchar_t *filename_w, char **filename) +{ + return wchartocp(CP_THREAD_ACP, filename_w, filename); +} + +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 */