Use the preprocessor to fake st_blocks

5 files changed, 8 insertions, 18 deletions

diff --git a/coreutils/du.c b/coreutils/du.c
index 05f114cc5..9c6ff8800 100644
--- a/coreutils/du.c
+++ b/coreutils/du.c
@@ -131,11 +131,7 @@ static unsigned long long du(const char *filename)
                 }
         }
 
-#if !ENABLE_PLATFORM_MINGW32
         sum = statbuf.st_blocks;
-#else
-        sum = (statbuf.st_size+511)/512;
-#endif
 
         if (S_ISLNK(statbuf.st_mode)) {
                 if (G.slink_depth > G.du_depth) { /* -H or -L */
@@ -144,11 +140,7 @@ static unsigned long long du(const char *filename)
                                 G.status = EXIT_FAILURE;
                                 return 0;
                         }
-#if !ENABLE_PLATFORM_MINGW32
                         sum = statbuf.st_blocks;
-#else
-                        sum = (statbuf.st_size+511)/512;
-#endif
                         if (G.slink_depth == 1) {
                                 /* Convert -H to -L */
                                 G.slink_depth = INT_MAX;
diff --git a/coreutils/ls.c b/coreutils/ls.c
index 2c5fda96a..166473d4d 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -754,12 +754,7 @@ static struct dnode *my_stat(const char *fullname, const char *name, int force_f
         cur->dn_ctime  = statbuf.st_ctime ;
 #endif
         cur->dn_ino    = statbuf.st_ino   ;
-#if !ENABLE_PLATFORM_MINGW32
         cur->dn_blocks = statbuf.st_blocks;
-#else
-        /* MinGW does not have st_blocks */
-        cur->dn_blocks = 0;
-#endif
         cur->dn_nlink  = statbuf.st_nlink ;
         cur->dn_uid    = statbuf.st_uid   ;
         cur->dn_gid    = statbuf.st_gid   ;
diff --git a/coreutils/stat.c b/coreutils/stat.c
index 0d13fdf65..6cee2ce23 100644
--- a/coreutils/stat.c
+++ b/coreutils/stat.c
@@ -343,11 +343,7 @@ static void FAST_FUNC print_stat(char *pformat, const char m,
                 printf(pformat, (unsigned long) 512); //ST_NBLOCKSIZE
         } else if (m == 'b') {
                 strcat(pformat, "llu");
-#if !ENABLE_PLATFORM_MINGW32
                 printf(pformat, (unsigned long long) statbuf->st_blocks);
-#else
-                printf(pformat, (unsigned long long) ((statbuf->st_size+511)/512));
-#endif
         } else if (m == 'o') {
                 strcat(pformat, "lu");
 #if !ENABLE_PLATFORM_MINGW32
diff --git a/include/mingw.h b/include/mingw.h
index c4748735d..e8c55f646 100644
--- a/include/mingw.h
+++ b/include/mingw.h
@@ -248,6 +248,13 @@ int mingw_fstat(int fd, struct stat *buf);
 #define lstat mingw_lstat
 #define _stati64(x,y) mingw_stat(x,y)
 
+/* The Windows stat structure doesn't have the st_blocks member.  This
+ * macro calculates st_blocks from st_size.  It would be better if we
+ * could put brackets around it but most references to st_blocks in BusyBox
+ * are pretty simple and work without brackets.
+ */
+#define st_blocks st_size+511>>9
+
 /*
  * sys/sysmacros.h
  */
diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c
index 3f223343e..94565f855 100644
--- a/util-linux/swaponoff.c
+++ b/util-linux/swaponoff.c
@@ -60,7 +60,7 @@ static int swap_enable_disable(char *device)
 #if ENABLE_DESKTOP
         /* test for holes */
         if (S_ISREG(st.st_mode))
-                if (st.st_blocks * (off_t)512 < st.st_size)
+                if ((st.st_blocks) * (off_t)512 < st.st_size)
                         bb_error_msg("warning: swap file has holes");
 #endif