From patchwork Tue May 24 22:20:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 35912 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp766069pzj; Tue, 24 May 2022 15:21:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyxLK2isL00stBtAgkbpx7VgWp5vFxYCJw0fCd8iQiqF+QwQdgg+FUUdb+41hdyGz12wQo2 X-Received: by 2002:a17:907:7674:b0:6fe:9ca3:2a55 with SMTP id kk20-20020a170907767400b006fe9ca32a55mr25413536ejc.125.1653430880740; Tue, 24 May 2022 15:21:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653430880; cv=none; d=google.com; s=arc-20160816; b=byM0171LA9UUxegPIdXD8LWe7qqlbrCumffAwWvivH4QHs1wbBPFpyLjgg7qUGq89V O7ZOOIluzFhcum+rwX5BOIWJTL/lzijBWOPSEnYyLbj/5Rxi302ccWXM0Pv3e/zdUWcF lAN3lSK1huca37CBgtJyY5uk5GlTfQcrTSzJohbkCpFEYplVb5HRFTn8rWDxLTdh5e8C rl6jxfyp7/XNyi7QLnFFSd55FLIOrxqawLrxz18+Ut7SyyRVQc7ekYwPj2kljIGIuyg3 a2Vwb7ujPjDVzKgJwYOVToQovc+5QkXQianFnjuuaXh10fj6UhZbnsm6sx3KSUjtXXB3 +FwA== 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=m5ryowHryNYXDkjFc2coJfnHMAAR+S1179xFTM7XRgQ=; b=TIyaC8hT86AtotBFPfGNydz1xzZa1N2i1/oUlMj6KGzSjLU5s0xEUPc9GxN8GK0C9F STijKrgOzsQrxQluroTE5lIT6S9q3d+gKXxPtw1JTFhkBcCHpeCYODbLJhWk3G2Ct/m5 mEOabItv06jFY+ekbTWPTtqi3XcKo3rrcWl901gykWt9qozKmeTD++mLKxnWG92CX7JH x58M9PL0G8kE7w+rLODUf6wCToTkxQuZ0+y8QLDOPBTiwfO9PdGHObtQgUs8Kt1PZVx/ XrsKosjWPUbPZ16N1IlPjreSm6r2X8GML8UL4sAOi/r9N4Nz6mho4b6Vetv37UVSTr5h zbDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=ke6kyRmd; 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 jg31-20020a170907971f00b006f3b5469ea0si10087005ejc.96.2022.05.24.15.21.20; Tue, 24 May 2022 15:21:20 -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=ke6kyRmd; 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 B2BE668B5AE; Wed, 25 May 2022 01:21:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D676C68B443 for ; Wed, 25 May 2022 01:20:56 +0300 (EEST) Received: by mail-pf1-f173.google.com with SMTP id y1so1610937pfr.6 for ; Tue, 24 May 2022 15:20:56 -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=MYkqaEiTntTjEaeyog5bI7QVJPgf/1OR4jjI/zDztDQ=; b=ke6kyRmdnBLn9PRHI/7oLXX5FRH103HFei+nEk5MsTxKv+Y6D4T0I63qIxV6dnqpqu JczjbPduQMmIzAVbyL19itqRltN+Y/I+AhyZkX99ofmttOGULeATnK9RXtK707lnYHeK +V4g7LewsormMkdrWSzHSwTG8JaoB8rNp3incJ4L7xrmdryosU2XFMk/BXnuUVU/LGJW VIYTuRAWz7hiwHB8UpSkhZLHaXoj7I0NC8alYqS2+kRuLKcblyTRo0l5QbuDsNcGFyNK O7PBpNntQrfUHIBh6xREQJPUlmm1o/CEHikT7RIN2x/msy+OZCryf1N8QnIbW8dHhSZG PKcQ== 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=MYkqaEiTntTjEaeyog5bI7QVJPgf/1OR4jjI/zDztDQ=; b=R05qKlbO8BjdPIOV2Naw76xuOXbK7BN/s+qfV0fg8OuOByar85F2RNE3YyoJo/2MUW 6BHlG3zN0qR+7uHTL6KmbLQXzNYATtm+D6/xgy294lhx0k8ApU5KwLmAu+6euxsqf9PK QxqE1pVNU46hOj8Ye+FO+vtPYUj42hA44hJ/YNGGP2Is8M88CtmycqUEhKglElW3SWKa t0jWjYt616IWM1tNx87zdVCwxx3VcrBsTdMS97ZV5zhjLZXzovh/yqTvPvNZqnfMTDkR 1NpyOb5ojHISEX2TVCHMZbDfhsxchVx2QwieEOLUfHySVpmTM+G9XaiFSjLaDRK1hD6/ Q82g== X-Gm-Message-State: AOAM532v0peH/iN7WjRirIz0AXp+fgX6L4qresgTuGFUSuwa/zfuNtxb RRi5lbviFIHxacniuqHpRKKR7t1KPkQfiQ== X-Received: by 2002:a05:6a00:849:b0:518:bcbb:a6e1 with SMTP id q9-20020a056a00084900b00518bcbba6e1mr7607677pfk.86.1653430855268; Tue, 24 May 2022 15:20:55 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id o8-20020a62f908000000b0050dc76281fasm9785782pfh.212.2022.05.24.15.20.54 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 May 2022 15:20:54 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: <7751335906bcaa5da249928c9830fcc75b01970c.1653430851.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Tue, 24 May 2022 22:20:50 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v7 2/3] 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: 9jBbuJl4EcAF From: softworkz Signed-off-by: softworkz --- libavformat/os_support.h | 106 ++++++++++++++++++++++++++++++--------- 1 file changed, 81 insertions(+), 25 deletions(-) diff --git a/libavformat/os_support.h b/libavformat/os_support.h index 5e6b32d2dc..1c3b234b06 100644 --- a/libavformat/os_support.h +++ b/libavformat/os_support.h @@ -49,11 +49,28 @@ # 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) */ + int64_t st_size; /* total size, in bytes */ + int64_t st_atime; /* time of last access */ + int64_t st_mtime; /* time of last modification */ + int64_t st_ctime; /* time of last status change */ + }; + # ifdef fstat # undef fstat # endif -# define fstat(f,s) _fstati64((f), (s)) +# define fstat win32_fstat #endif /* defined(_WIN32) */ @@ -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,76 @@ 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); +} + +static inline void copy_stat(struct _stati64 *winstat, struct win32_stat *par) +{ + 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; } -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 win32_stat *par) +{ + struct _stati64 winstat = { 0 }; + wchar_t *filename_w; + int ret; + + 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); + + copy_stat(&winstat, par); + + return ret; +} + +static inline int win32_fstat(int fd, struct win32_stat *par) +{ + struct _stati64 winstat = { 0 }; + int ret; + + ret = _fstat64(fd, &winstat); + + copy_stat(&winstat, par); + + 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; }