From patchwork Mon May 16 21:23:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 35800 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp1732891pzb; Mon, 16 May 2022 14:23:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwzMcvqC2W/jR7CDA298KshJiw9okGJ+HaG05ExXlDtHD9Sw4+qKlAlr3+S8oQJVS6huj+d X-Received: by 2002:a17:906:3a45:b0:6f4:e9e7:4ff with SMTP id a5-20020a1709063a4500b006f4e9e704ffmr16961420ejf.100.1652736234177; Mon, 16 May 2022 14:23:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652736234; cv=none; d=google.com; s=arc-20160816; b=ENcj+xijB42rOXrljLeeHdq1+lli0nLG0kvIkHXiod5kmDkEE6+GJPQS2xlur89IpY XU6NgOaMOka4Jj2nOo9HBFLKWxaQZcsW3F7biVcBNuIpZUaxN+V6/u4e6UMm2nOOzXFR l3xUg9fO4y3anumimbHjNf69OoDkzEPnsG+UOpCkdjKz2P3yLRuYf0zlR3LIcC10DluA 1Gchf9bO+jI0kO4t89QdKYkaUCOKqKTWF1k5whLIUWuznIzOafYH9bg6RKcM/tANtA91 pQYndhFVk8eNOrexchIZvN5p3qvgBR+yfpkTsXMIP0rUsCydNPOq83Q2An0I8UfBcFId M2CA== 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=5lGGJXzHP0zOnfub1SZ1V/42ncqzEkplTrwUQeiH2Wo=; b=VEcf2I9tlG6DEPIJ9AuKY4bH4yxXQeBuS/mMU7RICIPt5mZC5zig4mjbSQB4tm3420 pJ01pfpEp+itfr0JkyzNeZ49ItvJxItkhD89mq8vgZGM0jeX7XLU7Ky/5zRF2m5mqOs/ DsrB40zMAyfbHeFz07krZkXwWdiwiNdi/fRyFPPjhLkwJ3kaTEAg1J5iQDNzHU7Fq+9s sDXxlM3i/PhYuqnUXdumuew/VIBm9Klq/VWtO6bfhNl4cKcE7GmyLYUPsfcaKRJHniDQ WOjrPD2j6adgPWg8j7z+PRXLpecwYyvPiSiEFRe40os7sBj/ckoiQ4XMIa/iK0oWyC1/ w/lg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=ekIaH6jY; 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 cn14-20020a0564020cae00b0042ab8c67587si2403009edb.95.2022.05.16.14.23.53; Mon, 16 May 2022 14:23:54 -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=ekIaH6jY; 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 555E268B45D; Tue, 17 May 2022 00:23:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 535C468B423 for ; Tue, 17 May 2022 00:23:28 +0300 (EEST) Received: by mail-pj1-f54.google.com with SMTP id w17-20020a17090a529100b001db302efed6so526965pjh.4 for ; Mon, 16 May 2022 14:23:28 -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=0gVA2fKvCnahMCkE6ckhkQ1B2TquPH11Uf6lOPzeTB4=; b=ekIaH6jY6hUZ7lmEgpWM+KLpDWr3tq5drPkxRI88u8FFEDhjcNYyr5GH5pxJ80G09g W5J9ABAgpGhquBBY7UkvEbTACOKTvW55CCyxzG8p8TxeTg6D0XSamTIDPci/iD5MXEq5 rqSsyd/BEN8v6H05uzXNhq23OwlNXATv0EnPU/jVlAUrs1U3tN9VqK/EAK+JJ7qWtJYX +EUb0gW8kbH6IThohl1JUBwDzHHa1Go3YV/b46iVgwxysJlSxNYRRfZoZ8izCHYQYRBS UJ814wjJN2u1cGovTDW9G77ZxF3b61xMeoSrLfE/vcKqJgZNIvmDwouub8JIX0EIcczG ECzA== 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=0gVA2fKvCnahMCkE6ckhkQ1B2TquPH11Uf6lOPzeTB4=; b=BrugvQk3Cfu5rS8WJNSBVHbgxLPuIBYe9aoJfArpXr0aha3JFz2PQYimjaXbVlmGjD hA5UZ7Xks3Wo37qu0e85/tO/bLPpd/onI6xLWvbtCX0f0bpphSmxxYiVZwBpFznYdQoF GhhsXS+PR6sU8jx9U91pjHyP3Sv1YK1ngRTvoH0wVZegnoSEPUyUphHozLpqmMaBK5R/ i5L+2vZrAc6RLTDZ8kV390Jhjf1vKslIjyB7o6PedyhDWOUKxOj7whzVNlKSa/yGRnXY M+bkV/nNlDWXAaeVDUP5Ph7yyYtZ3cxlTv2utWy4kJMxty8gP52Hv1IjBnBQkY3uOgT2 CMsQ== X-Gm-Message-State: AOAM530jxBIh45pQJT7Wdk4KggCZuTLCQEQsZrD1KnloiR7Ve2Jfoovl AGahJ6GhIWd56Ny9t+Xek1VXRv8LJ41qxA== X-Received: by 2002:a17:903:1d1:b0:15e:9607:d4c9 with SMTP id e17-20020a17090301d100b0015e9607d4c9mr19508243plh.41.1652736206805; Mon, 16 May 2022 14:23:26 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id z8-20020a170902ccc800b0015ee24acf38sm7467528ple.212.2022.05.16.14.23.26 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 May 2022 14:23:26 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: In-Reply-To: References: Date: Mon, 16 May 2022 21:23:23 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v3 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: softworkz Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: m4Xg0ni7yLSt From: softworkz Signed-off-by: softworkz --- libavformat/os_support.h | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/libavformat/os_support.h b/libavformat/os_support.h index 5e6b32d2dc..bd8c89568f 100644 --- a/libavformat/os_support.h +++ b/libavformat/os_support.h @@ -49,7 +49,23 @@ # ifdef stat # undef stat # endif -# define stat _stati64 +# define stat win32_stat + + struct win32_stat + { + _dev_t st_dev; + _ino_t st_ino; + unsigned short st_mode; + short st_nlink; + short st_uid; + short st_gid; + _dev_t st_rdev; + __int64 st_size; + __time64_t st_atime; + __time64_t st_mtime; + __time64_t st_ctime; + }; + # ifdef fstat # undef fstat # endif @@ -153,7 +169,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; \ @@ -177,7 +193,7 @@ static inline int win32_##name(const char *filename_utf8, partype par) \ 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; \ @@ -199,9 +215,9 @@ 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; }