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.

2 files changed, 4 insertions, 2 deletions

diff --git a/libbb/copy_file.c b/libbb/copy_file.c
index be65c4b47..7da31f69d 100644
--- a/libbb/copy_file.c
+++ b/libbb/copy_file.c
@@ -81,11 +81,13 @@ int FAST_FUNC copy_file(const char *source, const char *dest, int flags)
         smallint retval = 0;
         smallint dest_exists = 0;
         smallint ovr;
+        int status;
 
 /* Inverse of cp -d ("cp without -d") */
 #define FLAGS_DEREF (flags & (FILEUTILS_DEREFERENCE + FILEUTILS_DEREFERENCE_L0))
 
-        if ((FLAGS_DEREF ? stat : lstat)(source, &source_stat) < 0) {
+        status = FLAGS_DEREF ? stat(source, &source_stat) : lstat(source, &source_stat);
+        if (status < 0) {
                 /* This may be a dangling symlink.
                  * Making [sym]links to dangling symlinks works, so... */
                 if (flags & (FILEUTILS_MAKE_SOFTLINK|FILEUTILS_MAKE_HARDLINK))
diff --git a/libbb/recursive_action.c b/libbb/recursive_action.c
index b5cf7c0ab..7ec3a1443 100644
--- a/libbb/recursive_action.c
+++ b/libbb/recursive_action.c
@@ -73,7 +73,7 @@ int FAST_FUNC recursive_action(const char *fileName,
         if (depth == 0)
                 follow = ACTION_FOLLOWLINKS | ACTION_FOLLOWLINKS_L0;
         follow &= flags;
-        status = (follow ? stat : lstat)(fileName, &statbuf);
+        status = follow ? stat(fileName, &statbuf) : lstat(fileName, &statbuf);
         if (status < 0) {
 #ifdef DEBUG_RECURS_ACTION
                 bb_error_msg("status=%d flags=%x", status, flags);