From patchwork Wed Feb 16 15:08:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 34338 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:90eb:0:0:0:0 with SMTP id a11csp1304119nkf; Wed, 16 Feb 2022 07:09:54 -0800 (PST) X-Google-Smtp-Source: ABdhPJxjG+AA2Ek6SaV+wwRtwQlOeuHZc4c57LpUz2yEczFXRovVAzMhpmwpEYZAJwtACC3sBrs4 X-Received: by 2002:a17:907:205a:b0:6cf:ced7:4e73 with SMTP id pg26-20020a170907205a00b006cfced74e73mr2723359ejb.536.1645024189746; Wed, 16 Feb 2022 07:09:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645024189; cv=none; d=google.com; s=arc-20160816; b=KiatgCQrY0Gn9xjrwmMnKQgJ90HszO1/15pc2EwzTB8+DrwWwi/TGUzbS/7bdc3D7Q 2fnr25VyLc+mriBLbt5dQKprklf6ZGTvEfiYfYSKh+azrHLpnNBZ9FPiGjnhUe8yj1PJ hbGP8QyhLLZ2mliC26ia821udksasAGxw6KUHtPfx08ScCMBqvY089UDoY1d4Rg1abJs RC74Yr4ebgaamiRFf9swytl/OgP9RgZLgTA5w3yBMNEq30Fhm8f/KKwP+S8qQQHFNCTa A3w/qQD6RXrp5sjBnWSAc0Qi5jWro8xrbvCojeRt3bQQxTT3iMwT0/DISGm1lLu+NU4j qhCQ== 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=kOJH89DrCadZRlZLvsnlKRQsf6205xl6clzbWaZvS17yiaLGJ9M83YC18IC7EngEtt IEJ1ljgoz4I4dcLol6zUKqGKYN833NMOYlkNy1s/KbcXyEu3BxBnQHgd11lNxd2qOXiF 3auvs67DV3JrtY4p9Z86jAesmVTnlcDgCQEhSy8E8KHK/xP3CamOYO6Qm9Iz8a3oi2vQ zB3HzlyeyPaPJFKtsZBL/h/hqHYNMYmajQ/spYKRsJdiBECBw2vz4gnXMlMgUhtwLYJb 8zqCBCj29Brl/zNl8lfYFAFL6sRpIVtMZQNltqbRIO5XZIWKz4PzJOflYSCslFuZekle 7q9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=JYUjPqhz; 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 i2si2016896edx.265.2022.02.16.07.09.25; Wed, 16 Feb 2022 07:09:49 -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=JYUjPqhz; 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 E586F68B27D; Wed, 16 Feb 2022 17:09:20 +0200 (EET) 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 ABBB068AEE9 for ; Wed, 16 Feb 2022 17:09:14 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1645024149; bh=r1IehPVeYpWe/29923wliDsg4mk6Oc/1SNiPqmEL74s=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:MIME-Version: Content-Transfer-Encoding; b=JYUjPqhzbcAjftF+UnNi/4x4gxy3/ZUxXYdD7l6csfdvACZ7wkcfWt1F9ahtmQZJm ARVeCQdOjMmXND8QNRVMW6UtVKsXJTBapxpZVZUSUGag7hzFuPM56YU87L35nky7qS aJFlSH91vJFLrlKmVA11/WfAsgtRZ4q1kDOQOYh0= Received: by b-1.in.mailobj.net [192.168.90.11] with ESMTP via ip-206.mailobj.net [213.182.55.206] Wed, 16 Feb 2022 16:09:09 +0100 (CET) X-EA-Auth: VZV8W68+iK9wdUSDCH32fZHhK677CJfNiA84Pjj3w6TwIY5X0w2Dhu28Sr8IzvPakNGu5JQsJI8q7T7LrBJdt73yJK1zGMPKNW6qTMn4WdA= From: nihil-admirari To: ffmpeg-devel@ffmpeg.org Date: Wed, 16 Feb 2022 18:08:55 +0300 Message-Id: <20220216150859.16844-1-nil-admirari@mailo.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 1/5] 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: zZZENflgC4yc 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 */