build: stop checking for `sys/stat.h`

It has been used unconditionally in `src` and `tests` since at least
2011-09-19 via fdecb56cbfcafe5b770c4181133655b89973f41e. There are
earlier unguarded references in `tests`.

Also de-duplicate to include it just once.

Ref: https://github.com/curl/curl/pull/17717#issuecomment-2996631026

Closes #17724

diff --git a/.github/scripts/cmp-config.pl b/.github/scripts/cmp-config.pl
index f6dee00f9bbb894f8efa4d64a82e1e948071afbe..930168c812478b766414dc063658c70f64967520 100755 (executable)
--- a/.github/scripts/cmp-config.pl
+++ b/.github/scripts/cmp-config.pl
@@ -73,6 +73,7 @@ my %remove = (
     '#define HAVE_STDIO_H 1' => 1,
     '#define HAVE_STDLIB_H 1' => 1,
     '#define HAVE_STRING_H 1' => 1,
+    '#define HAVE_SYS_STAT_H 1' => 1,
     '#define HAVE_SYS_XATTR_H 1' => 1,
     '#define HAVE_UNICODE_UIDNA_H 1' => 1,
     '#define HAVE_WOLFSSH_SSH_H 1' => 1,

diff --git a/CMake/unix-cache.cmake b/CMake/unix-cache.cmake
index 2f0da667552ea15ad38a03c763e2d1878c98d861..2c85626a49574b2cea9abad9567498a51305c050 100644 (file)
--- a/CMake/unix-cache.cmake
+++ b/CMake/unix-cache.cmake
@@ -286,7 +286,6 @@ if(CYGWIN OR
 else()
   set(HAVE_SYS_SOCKIO_H 1)
 endif()
-set(HAVE_SYS_STAT_H 1)
 set(HAVE_SYS_TYPES_H 1)
 set(HAVE_SYS_UN_H 1)
 if(CYGWIN)

diff --git a/CMake/win32-cache.cmake b/CMake/win32-cache.cmake
index 3bf77bb840944360bbe183c2d8d26c134213f4ad..4fe9eb1139f54a7c845acc0cfab98f93938ce833 100644 (file)
--- a/CMake/win32-cache.cmake
+++ b/CMake/win32-cache.cmake
@@ -169,7 +169,6 @@ set(HAVE_SYS_POLL_H 0)
 set(HAVE_SYS_RESOURCE_H 0)
 set(HAVE_SYS_SELECT_H 0)
 set(HAVE_SYS_SOCKIO_H 0)
-set(HAVE_SYS_STAT_H 1)
 set(HAVE_SYS_TYPES_H 1)
 set(HAVE_SYS_UN_H 0)
 set(HAVE_SYS_UTIME_H 1)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 08c6632669545054dc812c51d6abb03c05510c7a..d3c91e2f3fb37b0ebd83e9f1ce62ee97b2f738f4 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1638,7 +1638,6 @@ check_include_file("sys/poll.h"       HAVE_SYS_POLL_H)
 check_include_file("sys/resource.h"   HAVE_SYS_RESOURCE_H)
 check_include_file_concat_curl("sys/select.h"     HAVE_SYS_SELECT_H)
 check_include_file("sys/sockio.h"     HAVE_SYS_SOCKIO_H)
-check_include_file("sys/stat.h"       HAVE_SYS_STAT_H)
 check_include_file_concat_curl("sys/types.h"      HAVE_SYS_TYPES_H)
 check_include_file("sys/un.h"         HAVE_SYS_UN_H)
 check_include_file_concat_curl("sys/utime.h"      HAVE_SYS_UTIME_H)  # sys/types.h (AmigaOS)

diff --git a/configure.ac b/configure.ac
index 0d5da0073e742c59c2dc169e1cbe00b6c1fa4cba..f027cae0ecb1dd0e369f33da91f34892dd55956b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3912,7 +3912,6 @@ AC_CHECK_HEADERS(
   netinet/udp.h \
   netdb.h \
   sys/sockio.h \
-  sys/stat.h \
   sys/param.h \
   termios.h \
   termio.h \

diff --git a/lib/config-mac.h b/lib/config-mac.h
index 435e1293e036b15233b223e66fcefe8c07d1c5b2..6da544fe8fa1f1d0d5648c47f6074c5e3b61faec 100644 (file)
--- a/lib/config-mac.h
+++ b/lib/config-mac.h
@@ -50,7 +50,6 @@
 #define HAVE_SYS_TYPES_H        1
 #define HAVE_GETTIMEOFDAY       1
 #define HAVE_FCNTL_H            1
-#define HAVE_SYS_STAT_H         1
 #define HAVE_UTIME_H            1
 #define HAVE_SYS_UTIME_H        1
 #define HAVE_SYS_IOCTL_H        1

diff --git a/lib/config-os400.h b/lib/config-os400.h
index ec7fc9129d92546cdcd7f16931edb4268b75b0eb..064338ed2abdd84c86f21b8d863001b05083562b 100644 (file)
--- a/lib/config-os400.h
+++ b/lib/config-os400.h
@@ -161,9 +161,6 @@
 /* Define if you have the <sys/sockio.h> header file. */
 #undef HAVE_SYS_SOCKIO_H
 
-/* Define if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H
-
 /* Define if you have the <sys/types.h> header file. */
 #define HAVE_SYS_TYPES_H
 

diff --git a/lib/config-plan9.h b/lib/config-plan9.h
index 8d19925993d199bdc6690d0cc2405dea61948f8a..68d0cf7f569fac7d93dc8f23d33454c5ff819b1d 100644 (file)
--- a/lib/config-plan9.h
+++ b/lib/config-plan9.h
@@ -113,7 +113,6 @@
 #define HAVE_SYS_IOCTL_H 1
 #define HAVE_SYS_PARAM_H 1
 #define HAVE_SYS_RESOURCE_H 1
-#define HAVE_SYS_STAT_H 1
 #define HAVE_SYS_TYPES_H 1
 #define HAVE_SYS_UN_H 1
 #define HAVE_TERMIOS_H 1

diff --git a/lib/config-riscos.h b/lib/config-riscos.h
index 03a3cde074d8ce576f4a5080eff20d583b3ce0d8..3158c984ee3615e31d7a302a3648da8d2865323e 100644 (file)
--- a/lib/config-riscos.h
+++ b/lib/config-riscos.h
@@ -147,9 +147,6 @@
 /* Define if you have the <sys/sockio.h> header file. */
 #undef HAVE_SYS_SOCKIO_H
 
-/* Define if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
 /* Define if you have the <sys/types.h> header file. */
 #define HAVE_SYS_TYPES_H
 

diff --git a/lib/config-win32.h b/lib/config-win32.h
index 176f65a3b73379bb22827d3a0a64c651cc869ab0..363e7d85bf8607e852459728d3e4a5671a1d1c04 100644 (file)
--- a/lib/config-win32.h
+++ b/lib/config-win32.h
@@ -77,9 +77,6 @@
 /* Define if you have the <sys/sockio.h> header file. */
 /* #define HAVE_SYS_SOCKIO_H 1 */
 
-/* Define if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
 /* Define if you have the <sys/types.h> header file. */
 #define HAVE_SYS_TYPES_H 1
 

diff --git a/lib/curl_config.h.cmake b/lib/curl_config.h.cmake
index 3a9abaf1e9bae39d58b558ee090cf1dbec1a8456..0838ddccfba3fe98ba40e4ecc25d98d450185ab3 100644 (file)
--- a/lib/curl_config.h.cmake
+++ b/lib/curl_config.h.cmake
@@ -589,9 +589,6 @@
 /* Define to 1 if you have the <sys/sockio.h> header file. */
 #cmakedefine HAVE_SYS_SOCKIO_H 1
 
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#cmakedefine HAVE_SYS_STAT_H 1
-
 /* Define to 1 if you have the <sys/types.h> header file. */
 #cmakedefine HAVE_SYS_TYPES_H 1
 

diff --git a/lib/curl_setup_once.h b/lib/curl_setup_once.h
index 8d0cfcb3875818954a5e1f1a7e5a1803a31e30e6..bec45de88880bf1358eb6d876a2a6a81f3149386 100644 (file)
--- a/lib/curl_setup_once.h
+++ b/lib/curl_setup_once.h
@@ -41,9 +41,7 @@
 #include <sys/types.h>
 #endif
 
-#ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
-#endif
 
 #if !defined(_WIN32) || defined(__MINGW32__)
 #include <sys/time.h>

diff --git a/lib/vssh/libssh.c b/lib/vssh/libssh.c
index 643b8f4987f7a0bea212f2ca70f35fd0719ef1d3..ca0c5d09b28c0754e29d8c0650147c915e85ca19 100644 (file)
--- a/lib/vssh/libssh.c
+++ b/lib/vssh/libssh.c
@@ -70,9 +70,6 @@
 #include "../curlx/warnless.h"
 #include "curl_path.h"
 
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c
index 53fc329d077870ec7dc560616dc75f872d5d37b9..43f251a0a97acdfcd0f9f07376e59444a1db309f 100644 (file)
--- a/lib/vtls/vtls.c
+++ b/lib/vtls/vtls.c
@@ -43,9 +43,6 @@
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif

diff --git a/lib/vtls/vtls_scache.c b/lib/vtls/vtls_scache.c
index 1fe4b5bbdee64168c671679420ebc4cac751a381..15104294e2223fc851f2eb8a00122f9a4972085c 100644 (file)
--- a/lib/vtls/vtls_scache.c
+++ b/lib/vtls/vtls_scache.c
@@ -29,9 +29,6 @@
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif

diff --git a/src/tool_cb_wrt.c b/src/tool_cb_wrt.c
index 9babd54cf70a4fcc3e368eee43fbbcdef0ffe526..17574c6ecad6f9ece897b66719f447ae95aae5ac 100644 (file)
--- a/src/tool_cb_wrt.c
+++ b/src/tool_cb_wrt.c
@@ -28,8 +28,6 @@
 #include <fcntl.h>
 #endif
 
-#include <sys/stat.h>
-
 #include "tool_cfgable.h"
 #include "tool_msgs.h"
 #include "tool_cb_wrt.h"

diff --git a/src/tool_dirhie.c b/src/tool_dirhie.c
index de4bdcef647f10ed37273e9fd1dd1251df5dcf00..e4e3e859e7b417bc4cab1226edd54e66a60069b0 100644 (file)
--- a/src/tool_dirhie.c
+++ b/src/tool_dirhie.c
@@ -23,8 +23,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <sys/stat.h>
-
 #if defined(_WIN32) && !defined(UNDER_CE)
 #  include <direct.h>
 #endif

diff --git a/src/tool_findfile.c b/src/tool_findfile.c
index 4b09d0f708a114770fc26fa86d7cc7fd7a22c96b..72868f4b4f7344d20baeb020390ddfa6524dea59 100644 (file)
--- a/src/tool_findfile.c
+++ b/src/tool_findfile.c
@@ -29,9 +29,6 @@
 #define __NO_NET_API
 #endif
 
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif

diff --git a/src/tool_main.c b/src/tool_main.c
index 6c994d971f30750d2174183f09db66471fb04334..b1135f86283a27c79389cd33a7b296575db16db2 100644 (file)
--- a/src/tool_main.c
+++ b/src/tool_main.c
@@ -23,8 +23,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <sys/stat.h>
-
 #ifdef _WIN32
 #include <tchar.h>
 #endif