From patchwork Fri Feb 18 19:11:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 34390 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp1213170nkx; Fri, 18 Feb 2022 11:12:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJxsvOTVwDQ4IwBQfqmuRSoZo1zFDqxwbCPBjRlCZSGcB0lihBx7xba/BX2gJNHzz6qoUrrn X-Received: by 2002:a17:907:971b:b0:6cf:d2cf:d867 with SMTP id jg27-20020a170907971b00b006cfd2cfd867mr7598570ejc.669.1645211544835; Fri, 18 Feb 2022 11:12:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645211544; cv=none; d=google.com; s=arc-20160816; b=etexrCSivNUlYyPuEZ0QDlAGb4QQVM48Z2YHyYlL0lsutQth7Od8HoGwcC0fWcREv3 48xoWnVHr1kb1+30ClaevwOvB5OLc1sv8rDT+gCw34cgTDHM57O6f+cAFOUvUahh2R9s bfJSjySWTVQAYjmnxBKZl2+Y/jHN4TI3u7xiFkrkUW5XY8WJ1Hyv+sGYFFsG+xmuZfMD WdF5okQKQWa/s19lRc2rfZsgrgf++U9sf7ylFm+seNJW/iGB8fgBoVydJBIxuU+LWF0w b8J4zEUSAmcF4c+t6ufY+0uhFPUkuIMJBbf1aY1YKWfzge8Z5UghYU20Ein2evieOS/F JpvA== 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=0sex6uMP4Yj3G6Ef1zp1E9NiDv9+/uRez7ZXFFB4y8dLp3jrsQNMUItCbeuvuXVXOB WQIH28YkFI1KXLpo/ukJfk7wEOB6noNR6zWHYVfrfFKBjI8dno7skrXJSswy1dvRYvUd vViYqifCknj+CvkKAruSQW5THQ4RbcaixZEkp7iO1VriD8qEKbh+RGOCiHtFva7LPi07 xqjGtAzSu7lesoyzRyhzPoAnZ9rvFRECgHtkxDutoh8J465bRfFs+xuBu9pJHA1dyiVT ff93OrZ/rQovFPAj+tEBnRSTd9RAuIPue2I1iP99abdfbRWbZ49aoTWkn6AbNyTpCKyL nogA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b="Cm0q/3Pp"; 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 n12si1317569eja.800.2022.02.18.11.12.24; Fri, 18 Feb 2022 11:12:24 -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="Cm0q/3Pp"; 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 EC35968A785; Fri, 18 Feb 2022 21:12:20 +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 411E86801C8 for ; Fri, 18 Feb 2022 21:12:14 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1645211527; bh=r1IehPVeYpWe/29923wliDsg4mk6Oc/1SNiPqmEL74s=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:MIME-Version: Content-Transfer-Encoding; b=Cm0q/3PpOHj5vDrXs/ZBskUk85cchkiqgk/m7OOaEjl79+axMXpKXZBAK/HDU+Tpq FyCVdW5obLDJ6iMmApKo9VYUMd422xynLrDCYPT5CIflGNa6ZibiGYAaNAmNnmbCyT KYGuO7vAr8k87IaUTlePkRFEKib9RujUpD4vCThY= Received: by b-5.in.mailobj.net [192.168.90.15] with ESMTP via ip-206.mailobj.net [213.182.55.206] Fri, 18 Feb 2022 20:12:07 +0100 (CET) X-EA-Auth: tv3YkfSoPTCHMCOlzy15GkyA0ux5n78ryBslRXAN+FiR+CB8CsdAyaDzdN9YtB6TcdAdBkYbpWUCi2MfseyfkVEJBNWt1imHpXpq2b6RyJc= From: nihil-admirari To: ffmpeg-devel@ffmpeg.org Date: Fri, 18 Feb 2022 22:11:52 +0300 Message-Id: <20220218191157.15429-1-nil-admirari@mailo.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v6 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: d0YonhmeWbyA 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 */