Revise mingw_stat to minimise changes from upstream BusyBox

3 files changed, 1 insertions, 15 deletions

diff --git a/coreutils/cp.c b/coreutils/cp.c
index fee82c26b..de2e512be 100644
--- a/coreutils/cp.c
+++ b/coreutils/cp.c
@@ -149,11 +149,7 @@ 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 6e9fd09f0..5ba07ecc3 100644
--- a/coreutils/libcoreutils/cp_mv_stat.c
+++ b/coreutils/libcoreutils/cp_mv_stat.c
@@ -46,9 +46,5 @@ 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 e501fb41d..dc9d81c35 100644
--- a/coreutils/stat.c
+++ b/coreutils/stat.c
@@ -338,11 +338,7 @@ static void FAST_FUNC print_stat(char *pformat, const char m,
                 printf(pformat, (unsigned long long) statbuf->st_blocks);
         } else if (m == 'o') {
                 strcat(pformat, "lu");
-#if !ENABLE_PLATFORM_MINGW32
                 printf(pformat, (unsigned long) statbuf->st_blksize);
-#else
-                printf(pformat, (unsigned long) 4096);
-#endif
         } else if (m == 'x') {
                 printfs(pformat, human_time(statbuf->st_atime));
         } else if (m == 'X') {
@@ -550,7 +546,6 @@ 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;
 
@@ -565,8 +560,7 @@ static bool do_stat(const char *filename, const char *format)
                 }
         }
 #endif
-        status = option_mask32 & OPT_DEREFERENCE ? stat(filename, &statbuf) : lstat(filename, &statbuf);
-        if (status != 0) {
+        if ((option_mask32 & OPT_DEREFERENCE ? stat : lstat) (filename, &statbuf) != 0) {
                 bb_perror_msg("can't stat '%s'", filename);
                 return 0;
         }