Ensure mingw_stat is called when necessary

In some cases a funtion pointer to the stat function is used.
The preprocessor can't replace these with the mingw_stat, so
make alternative arrangements in those cases.

3 files changed, 11 insertions, 1 deletions

diff --git a/coreutils/cp.c b/coreutils/cp.c
index de2e512be..fee82c26b 100644
--- a/coreutils/cp.c
+++ b/coreutils/cp.c
@@ -149,7 +149,11 @@ int cp_main(int argc, char **argv)
         /* If there are only two arguments and...  */
         if (argc == 2) {
                 s_flags = cp_mv_stat2(*argv, &source_stat,
+#if !ENABLE_PLATFORM_MINGW32
                                 (flags & FILEUTILS_DEREFERENCE) ? stat : lstat);
+#else
+                                (flags & FILEUTILS_DEREFERENCE) ? mingw_stat : lstat);
+#endif
                 if (s_flags < 0)
                         return EXIT_FAILURE;
                 d_flags = cp_mv_stat(last, &dest_stat);
diff --git a/coreutils/libcoreutils/cp_mv_stat.c b/coreutils/libcoreutils/cp_mv_stat.c
index 5ba07ecc3..6e9fd09f0 100644
--- a/coreutils/libcoreutils/cp_mv_stat.c
+++ b/coreutils/libcoreutils/cp_mv_stat.c
@@ -46,5 +46,9 @@ int FAST_FUNC cp_mv_stat2(const char *fn, struct stat *fn_stat, stat_func sf)
 
 int FAST_FUNC cp_mv_stat(const char *fn, struct stat *fn_stat)
 {
+#if !ENABLE_PLATFORM_MINGW32
         return cp_mv_stat2(fn, fn_stat, stat);
+#else
+        return cp_mv_stat2(fn, fn_stat, mingw_stat);
+#endif
 }
diff --git a/coreutils/stat.c b/coreutils/stat.c
index e6b0e95de..259481750 100644
--- a/coreutils/stat.c
+++ b/coreutils/stat.c
@@ -564,6 +564,7 @@ static bool do_statfs(const char *filename, const char *format)
 static bool do_stat(const char *filename, const char *format)
 {
         struct stat statbuf;
+        int status;
 #if ENABLE_SELINUX
         security_context_t scontext = NULL;
 
@@ -578,7 +579,8 @@ static bool do_stat(const char *filename, const char *format)
                 }
         }
 #endif
-        if ((option_mask32 & OPT_DEREFERENCE ? stat : lstat) (filename, &statbuf) != 0) {
+        status = option_mask32 & OPT_DEREFERENCE ? stat(filename, &statbuf) : lstat(filename, &statbuf);
+        if (status != 0) {
                 bb_perror_msg("can't stat '%s'", filename);
                 return 0;
         }