From patchwork Thu May 26 09:28:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 35946 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp280359pzj; Thu, 26 May 2022 02:29:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz4+uDBkxapqAs+FEBGYmdj0tUq9Xtpo4bGNJ9BvQBX7tGV9VTdAoiibkbEX+xcPcP1O15F X-Received: by 2002:a17:907:1693:b0:6ff:be2:fe6b with SMTP id hc19-20020a170907169300b006ff0be2fe6bmr8434337ejc.674.1653557361824; Thu, 26 May 2022 02:29:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653557361; cv=none; d=google.com; s=arc-20160816; b=q79piLBU3v0os4t4YVSk7Fm5koWeho3sXS6VMB9kX2GUHsqvx7w0OHzLHyrOrQ1ImE 5hJ7JH94COUp5eMpCKoxGMPumne96O+Hny+1S+VvqHLfPtASHOszoW1XV3wJmPa2FaIB +Lk+wh5z+OR7Lp03R2yJVb9GMAeGLzrGo6pTcbtn6Mn9wa6k0HNI3JWl6ACyAOlXQMUn EKU9E0YhmIuQJ2K4GDShb55Sa4yXyCTn1YzPFmDRiSrsGdhu91anuYnC8NBSVEkVXN+z oXZAeXr/gbdwGXnbRgQ/wfyy8vQHeYkGDRWwgUiT+j5Sw966Bgd2hEly4edFoRmoSOli tLgw== 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=Fd7Hy3Q+HbYsU+tp2ioFW4gE6etfMUrSW3uocsLPppo=; b=Q3A292ip3UpIjnEln5RZ0cctk6T4j624tpDKpFpLFO3fTFpqfxDYTVLuEcTXyFde6n oIDSb2VOWPdMxYSj5RHMrZUKnRCmpcY4abcy7lXbmJ4g3SLbUzatF9vBN8Tu0Nryxvzz h5RpYFmmjGpEQIjyeDhMxrpKPrlCSUStNtM+nxou/FsQvI5sAmXZaU5UZPOowbjVPc2y BOgChxLWXJ05Pec6BKoyuakbRZTqteMiN3HLMDUExxYN6QmOeYSmEgATGTL3dxRjpYrM 1Z81aPuMvi0tWjG++R51PQ4VGprPGnB+GOkCoP+dQcI74KjXzLPzjSXA2RCJN7ksxKq/ 7o3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=NjFbUGY7; 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 z12-20020aa7cf8c000000b0042bb19c6413si81902edx.503.2022.05.26.02.29.21; Thu, 26 May 2022 02:29:21 -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=NjFbUGY7; 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 2EC5768B5BB; Thu, 26 May 2022 12:29:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DA55A68B57F for ; Thu, 26 May 2022 12:28:56 +0300 (EEST) Received: by mail-pj1-f52.google.com with SMTP id pq9-20020a17090b3d8900b001df622bf81dso1246903pjb.3 for ; Thu, 26 May 2022 02:28: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=ecxIyE5ESww6aSLsGupRo4tBtV9tVupIqN0ewBlYJoY=; b=NjFbUGY7my/sDtmj6qgZvuB2cvuPRlY6bjQJeSG85fPj+EiDhQQfDjF2F1ngiEWt5u EsgDMY0n5cacZFOeL3Rmst6/HYHdxspt5pbF7ZXoCy6sL5cUWJNasS+TYydtIz1uSzJD /TItMhNKZxjQf75EVEatBqAUBI5Jji80b8RptQI/FzdFRu8uR9bEJh8ikytFx2wiDg1F Hx0BmZJuBofavg03n29zPZKJAXnCZZQtA19Xy3A+776h6YvWBOQCRYAXSPMfAHS3hUaW SNKQdgU7P7kUeOGB87cHoifzSvSlq9byp6l1I6xlUyPneyaCv7SMr0x+uTxXi2mo0Clo 1wCg== 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=ecxIyE5ESww6aSLsGupRo4tBtV9tVupIqN0ewBlYJoY=; b=wXMVjBgQYdsxa53+Bt8yiohmgkph+dpvHYSx07xALNDjs4PtPYPIYTyI7TzRKuboXp l3tARbGWSJ6L95h5FlU4inLb/MoInIG1Ca5Tu0AxWV5xTNrzx/XY5VroOCIqbfNwaLYU wqBI501yREM/599uMvM881mdf6xFNd3mRuSZ1qLuTJE1JcOhuZAmyN1AtGOOZKzLjzNi 8IjzLZaNJmQ66y5x6knuYAr20aRmwBxsowMbMx1TqYpbdSeyvMYaZv1lnDtH42fzqoEN zk+7FN/i2vHJPV6pZzdnzxttGlbbuM98XQ5sinTnaokzk86onaxzJq3Q5u77/S9LJCOn cpSg== X-Gm-Message-State: AOAM530IAZXdMSMpx8b0oMjO6clpe/CbFZM4nbGzWXgxBSGCutTLnz7+ evoK9wd4FNh2EEjmk5NbEdC+mi+wWZV25A== X-Received: by 2002:a17:90a:930b:b0:1d5:684b:8e13 with SMTP id p11-20020a17090a930b00b001d5684b8e13mr1646728pjo.153.1653557335076; Thu, 26 May 2022 02:28:55 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id q8-20020a170902f78800b001618644d8b5sm1000531pln.154.2022.05.26.02.28.54 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 May 2022 02:28:54 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: In-Reply-To: References: Date: Thu, 26 May 2022 09:28:49 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v8 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: VdbEnUFTsjQ+ From: softworkz Signed-off-by: softworkz --- libavformat/os_support.h | 116 ++++++++++++++++++++++++++++++--------- 1 file changed, 91 insertions(+), 25 deletions(-) diff --git a/libavformat/os_support.h b/libavformat/os_support.h index 5e6b32d2dc..958976cc6f 100644 --- a/libavformat/os_support.h +++ b/libavformat/os_support.h @@ -49,11 +49,38 @@ # ifdef stat # undef stat # endif -# define stat _stati64 + +# define stat win32_stat + + /* + * The POSIX definition for the stat() function uses a struct of the + * same name (struct stat), that why it takes this extra effort for + * redirecting/replacing the stat() function with our own one which + * is capable to handle long path names on Windows. + * The struct below roughly follows the POSIX definition. Time values + * are 64bit, but in cases when _USE_32BIT_TIME_T is defined, they + * will be set to values no larger than INT32_MAX which corresponds + * to file times up to the year 2038. + */ + 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 +180,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 +198,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 mode) +{ + 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, mode); + av_free(filename_w); + return ret; +fallback: + return _access(filename_utf8, mode); +} + +static inline void copy_stat(struct _stati64 *crtstat, struct win32_stat *buf) +{ + buf->st_dev = crtstat->st_dev; + buf->st_ino = crtstat->st_ino; + buf->st_mode = crtstat->st_mode; + buf->st_nlink = crtstat->st_nlink; + buf->st_uid = crtstat->st_uid; + buf->st_gid = crtstat->st_gid; + buf->st_rdev = crtstat->st_rdev; + buf->st_size = crtstat->st_size; + buf->st_atime = crtstat->st_atime; + buf->st_mtime = crtstat->st_mtime; + buf->st_ctime = crtstat->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 *buf) +{ + struct _stati64 crtstat = { 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, &crtstat); + av_free(filename_w); + } else + ret = _stat64(filename_utf8, &crtstat); + + copy_stat(&crtstat, buf); + + return ret; +} + +static inline int win32_fstat(int fd, struct win32_stat *buf) +{ + struct _stati64 crtstat = { 0 }; + int ret; + + ret = _fstat64(fd, &crtstat); + + copy_stat(&crtstat, buf); + + 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; }