From patchwork Tue May 24 13:58:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 35909 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp554538pzj; Tue, 24 May 2022 06:59:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzizRD+oJezsy01dKBL9IH89sWgJnIay5b+zyG5Y5OI+1OrTSHst4Xu97kkTWnsbncEUa6l X-Received: by 2002:a17:907:a40f:b0:6f4:d2af:b720 with SMTP id sg15-20020a170907a40f00b006f4d2afb720mr24241820ejc.305.1653400741332; Tue, 24 May 2022 06:59:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653400741; cv=none; d=google.com; s=arc-20160816; b=ROKsq6dpSma+CCsLxZS1ABfppiWPuZCsPNfwAoipmgbKWGP46wFCjavaQnyhciUKKF nycg+GMsZBymQEnh/hPNmoAEmGIhWyWdurJ8ebSLJHpD519474frTpQlHeMm0MscRSpV YrqDYXuVITuIITrv409l7bShkQTMvxo0D95lfnKnoqM/s8LQ9J19BUezmp0b/AP4IOa2 ePO9xWivHnk6oMIbi+xm3xRbOgyfsYGLf3Hg6zecVuQBctjdKPC7iTnP8tMDUDFFcd5q WJvUVxvxaR6WKXNlIyd7yu3crARVaBvbqh3ucC0ZmvF91i2TW4AY2OTHHT0R1pfVbVjh iNmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:mime-version:fcc:date:references :in-reply-to:message-id:from:dkim-signature:delivered-to; bh=quSwdCZVXixkuYbplZEJnTeUCNTQ3cQHgvPhFINENnE=; b=rgS9NAhrjvtJh6mf9Zn1IDDCftRpsi25ozf6T3agz43LNHtWFN7fAYXVOtMySi9T3d 3m//xi4Mtk6+bzoNlKgZa+7VAtWDY/hx0/hm277KTCMDOlQWRCAk3ePMovaVm0/Cr4JB dpIe+hodw/iiFQ6ldbnU89xh2kBGA3l2wGnHMKMtufN1kTJxWQDqOv7hdFseV4gUPQUz JKtx8iffhYduLgzsI8fpMkd+aW4JINzFu+l6QznWQs7Bhm50DWjSgqG0D539wusD4N/U 2mKIfg2NpbPVCEDw96P7eeDo/xhcgsSz3mJnDERanWGh1lQhoPb+yoxN88Sxv2iq2CEy OADQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Xd6XDP9G; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g25-20020a1709067c5900b006e8baf14cc8si16404766ejp.927.2022.05.24.06.59.00; Tue, 24 May 2022 06:59:01 -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=@gmail.com header.s=20210112 header.b=Xd6XDP9G; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EA8B068B533; Tue, 24 May 2022 16:58:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D169468B4BA for ; Tue, 24 May 2022 16:58:35 +0300 (EEST) Received: by mail-pg1-f182.google.com with SMTP id v15so2202363pgk.11 for ; Tue, 24 May 2022 06:58:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:message-id:in-reply-to:references:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=z4qnDKaU7NiAp+Yq5njmXny4Waw60PB6yXyd2ApBlcg=; b=Xd6XDP9Gn9UNhaON7zn0ZzWMO/nvlFadDmYcW26YAk96xmJA5Le6Gbj10N83OJf0aY LEXGd+JePXBXnwodkzoTCDlDgl/LRNWhQRkR+akhW/PM/uvbmdM/8YFikbjRQYM77H0e BNA20Wl2IepDgt9fJw5AiB0WuPsvsSmghi95CHSfjntrVaL069cx/qQ8OdRgDntCtW06 Mk1z+zboRaGC2U/8NJ53n5KrzIENn55+2bdW7BjQKPIenmKZGQjbUcPJ//ML8gdxrASB SK0KROeEb7jRVPJvmP00eQMOnVP8xO/C7jg6o1FFVDZUS+HMmm4EUH0xZ0R4FZeWRFiQ TlHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:message-id:in-reply-to:references:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=z4qnDKaU7NiAp+Yq5njmXny4Waw60PB6yXyd2ApBlcg=; b=s8lV0fHWKPzY8wcZcWnLb7j+JxTJVxau/C3XqDyN+wVRkgiRxS7UkZHzskBygX742o uFWXJisD0cwKO3l9PrKr6UNc/5prubA5MHta5vedOjA8UTAtMgb5LfAOBiHpoO+3hFO8 boGAeF7eg0RyTwibBvcVE/X0i5HmLbsa8nXcwIlaW6t0be9PAocLJKCs7U03VFlCKx1q oElCokjMTanDqt9roSmocT1mSbq2boB6ul6SQDFxw2qU+/dxgH9MqmOVd42dSFvf/ZGr 9w6Fz2XLQT7nynxib0HLGMCgr6O1bzd4XxBrTIoBHfqPhK7FW4QD80LIn8FmVzoGiD4g tKtg== X-Gm-Message-State: AOAM531unDoMJY/OZhnTcNf++uKme/Y/DlokBqw0bl5TWRf/kIhRMA1w CmgMP1LeGc7pMiQ9YBs/NSQAFVO2KYWvAg== X-Received: by 2002:a63:4c5d:0:b0:3fa:c6b9:c5eb with SMTP id m29-20020a634c5d000000b003fac6b9c5ebmr560974pgl.602.1653400713862; Tue, 24 May 2022 06:58:33 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id pv4-20020a17090b3c8400b001df1f7c5941sm1753825pjb.16.2022.05.24.06.58.33 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 May 2022 06:58:33 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: <6f8d400db74be1d704b4c98e2f1295803829ce75.1653400709.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Tue, 24 May 2022 13:58:29 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v6 2/2] avformat/os_support: Support long file names on Windows 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 Cc: Martin =?utf-8?q?Storsj=C3=B6?= , softworkz , Hendrik Leppkes Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: PIf8KqkZsGvx From: softworkz Signed-off-by: softworkz --- libavformat/os_support.h | 87 +++++++++++++++++++++++++++++----------- 1 file changed, 63 insertions(+), 24 deletions(-) diff --git a/libavformat/os_support.h b/libavformat/os_support.h index 5e6b32d2dc..179b926293 100644 --- a/libavformat/os_support.h +++ b/libavformat/os_support.h @@ -49,7 +49,24 @@ # ifdef stat # undef stat # endif -# define stat _stati64 + +# define stat win32_stat + + struct win32_stat + { + _dev_t st_dev; /* ID of device containing file */ + _ino_t st_ino; /* inode number */ + unsigned short st_mode; /* protection */ + short st_nlink; /* number of hard links */ + short st_uid; /* user ID of owner */ + short st_gid; /* group ID of owner */ + _dev_t st_rdev; /* device ID (if special file) */ + long st_size; /* total size, in bytes */ + time_t st_atime; /* time of last access */ + time_t st_mtime; /* time of last modification */ + time_t st_ctime; /* time of last status change */ + }; + # ifdef fstat # undef fstat # endif @@ -153,7 +170,7 @@ static inline int win32_##name(const char *filename_utf8) \ wchar_t *filename_w; \ int ret; \ \ - if (utf8towchar(filename_utf8, &filename_w)) \ + if (get_extended_win32_path(filename_utf8, &filename_w)) \ return -1; \ if (!filename_w) \ goto fallback; \ @@ -171,37 +188,59 @@ DEF_FS_FUNCTION(unlink, _wunlink, _unlink) DEF_FS_FUNCTION(mkdir, _wmkdir, _mkdir) DEF_FS_FUNCTION(rmdir, _wrmdir , _rmdir) -#define DEF_FS_FUNCTION2(name, wfunc, afunc, partype) \ -static inline int win32_##name(const char *filename_utf8, partype par) \ -{ \ - wchar_t *filename_w; \ - int ret; \ - \ - if (utf8towchar(filename_utf8, &filename_w)) \ - return -1; \ - if (!filename_w) \ - goto fallback; \ - \ - ret = wfunc(filename_w, par); \ - av_free(filename_w); \ - return ret; \ - \ -fallback: \ - /* filename may be be in CP_ACP */ \ - return afunc(filename_utf8, par); \ +static inline int win32_access(const char *filename_utf8, int par) +{ + wchar_t *filename_w; + int ret; + if (get_extended_win32_path(filename_utf8, &filename_w)) + return -1; + if (!filename_w) + goto fallback; + ret = _waccess(filename_w, par); + av_free(filename_w); + return ret; +fallback: + return _access(filename_utf8, par); } -DEF_FS_FUNCTION2(access, _waccess, _access, int) -DEF_FS_FUNCTION2(stat, _wstati64, _stati64, struct stat*) +static inline int win32_stat(const char *filename_utf8, struct stat *par) +{ + wchar_t *filename_w; + int ret; + struct _stati64 winstat = { 0 }; + + if (get_extended_win32_path(filename_utf8, &filename_w)) + return -1; + + if (filename_w) { + ret = _wstat64(filename_w, &winstat); + av_free(filename_w); + } else + ret = _stat64(filename_utf8, &winstat); + + par->st_dev = winstat.st_dev; + par->st_ino = winstat.st_ino; + par->st_mode = winstat.st_mode; + par->st_nlink = winstat.st_nlink; + par->st_uid = winstat.st_uid; + par->st_gid = winstat.st_gid; + par->st_rdev = winstat.st_rdev; + par->st_size = winstat.st_size; + par->st_atime = winstat.st_atime; + par->st_mtime = winstat.st_mtime; + par->st_ctime = winstat.st_ctime; + + return ret; +} static inline int win32_rename(const char *src_utf8, const char *dest_utf8) { wchar_t *src_w, *dest_w; int ret; - if (utf8towchar(src_utf8, &src_w)) + if (get_extended_win32_path(src_utf8, &src_w)) return -1; - if (utf8towchar(dest_utf8, &dest_w)) { + if (get_extended_win32_path(dest_utf8, &dest_w)) { av_free(src_w); return -1; }