[dirent] update to 1.24 (#34043)

* [dirent] update to 1.24

* [dirent] update to 1.24

* fix deps

* fix deps

* fix deps

* fix deps

* CI [skip actions]

* CI [skip actions]

* fix deps

* CI [skip actions]

* fix deps
This commit is contained in:
Jia Yue Hua 2023-10-18 02:09:26 +08:00 committed by GitHub
parent bf3f056519
commit 91f1776a2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 58 additions and 8 deletions

View File

@ -6,8 +6,8 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO tronkko/dirent
REF 1.23.2
SHA512 e7a991445ee9ca8f1118753df559d28beb283b3c0d25edcfb23dd5322f2bdfeadffe802d0c908bb6d4dfc17bf5ec38bdecfa717319fb4e26682bee0ba0d14c5c
REF "${VERSION}"
SHA512 bdfc5cd41034719a7bcb3b04ad1c821b73e8ab37768b831362bdd36dceb2bab832ecb56ed6e99db145d38b15e295c0971496320b0482cb339dc973a9870bb72d
HEAD_REF master
)
file(INSTALL ${SOURCE_PATH}/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include)

View File

@ -1,7 +1,6 @@
{
"name": "dirent",
"version": "1.23.2",
"port-version": 3,
"version": "1.24",
"description": "Dirent is a C/C++ programming interface that allows programmers to retrieve information about files and directories under Linux/UNIX. This project provides Linux compatible Dirent interface for Microsoft Windows.",
"homepage": "https://github.com/tronkko/dirent",
"license": "MIT"

View File

@ -0,0 +1,40 @@
diff --git a/src/fsmagic.c b/src/fsmagic.c
index 7244841..2c553c1 100644
--- a/src/fsmagic.c
+++ b/src/fsmagic.c
@@ -66,7 +66,7 @@ FILE_RCSID("@(#)$File: fsmagic.c,v 1.81 2019/07/16 13:30:32 christos Exp $")
# define minor(dev) ((dev) & 0xff)
#endif
#undef HAVE_MAJOR
-#if S_IFLNK != 0
+#if S_IFLNK != 0 && ! defined(_WIN32)
private int
bad_link(struct magic_set *ms, int err, char *buf)
{
@@ -108,7 +108,7 @@ file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb)
int ret, did = 0;
int mime = ms->flags & MAGIC_MIME;
int silent = ms->flags & (MAGIC_APPLE|MAGIC_EXTENSION);
-#if S_IFLNK != 0
+#if S_IFLNK != 0 && ! defined(_WIN32)
char buf[BUFSIZ+4];
ssize_t nch;
struct stat tstatbuf;
@@ -122,7 +122,7 @@ file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb)
* Fstat is cheaper but fails for files you don't have read perms on.
* On 4.2BSD and similar systems, use lstat() to identify symlinks.
*/
-#if S_IFLNK != 0
+#if S_IFLNK != 0 && ! defined(_WIN32)
if ((ms->flags & MAGIC_SYMLINK) == 0)
ret = lstat(fn, sb);
else
@@ -290,7 +290,7 @@ file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb)
return -1;
break;
#endif
-#if S_IFLNK != 0
+#if S_IFLNK != 0 && ! defined(_WIN32)
case S_IFLNK:
if ((nch = readlink(fn, buf, BUFSIZ-1)) <= 0) {
if (ms->flags & MAGIC_ERROR) {

View File

@ -15,6 +15,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
"0013-Check-for-backslash-in-argv-0-on-Windows.patch"
"0014-Define-POSIX-macros-if-missing.patch"
"0015-MSYS2-Remove-ioctl-call.patch"
"0016-Fix-file_famagic-function.patch"
)
endif()

View File

@ -1,7 +1,7 @@
{
"name": "libmagic",
"version": "5.40",
"port-version": 2,
"port-version": 3,
"description": "This library can be used to classify files according to magic number tests.",
"homepage": "https://github.com/file/file",
"dependencies": [

View File

@ -2169,8 +2169,8 @@
"port-version": 1
},
"dirent": {
"baseline": "1.23.2",
"port-version": 3
"baseline": "1.24",
"port-version": 0
},
"discord-game-sdk": {
"baseline": "3.2.1",
@ -4394,7 +4394,7 @@
},
"libmagic": {
"baseline": "5.40",
"port-version": 2
"port-version": 3
},
"libmariadb": {
"baseline": "3.3.1",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "bcace8750d2b6080c63877eed432f8b862501012",
"version": "1.24",
"port-version": 0
},
{
"git-tree": "6df6238f6f97735c39e2e9b19d90f3895c4a636b",
"version": "1.23.2",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "2bb05dd744d7eb83ad0a8d887ef589aaea37f6b3",
"version": "5.40",
"port-version": 3
},
{
"git-tree": "d70a57e09ed4060b2ade1cb1f80bcbdbd8a7a1ec",
"version": "5.40",