5 files changed, 63 insertions, 2 deletions

diff --git a/configs/mingw32_defconfig b/configs/mingw32_defconfig
index 7108c2dda..8c0e2ed42 100644
--- a/configs/mingw32_defconfig
+++ b/configs/mingw32_defconfig
@@ -1035,7 +1035,7 @@ CONFIG_FEATURE_MIME_CHARSET=""
 #
 # Process Utilities
 #
-# CONFIG_FREE is not set
+CONFIG_FREE=y
 # CONFIG_FUSER is not set
 # CONFIG_IOSTAT is not set
 CONFIG_KILL=y
diff --git a/configs/mingw64_defconfig b/configs/mingw64_defconfig
index 0cb4f4a3e..89167b998 100644
--- a/configs/mingw64_defconfig
+++ b/configs/mingw64_defconfig
@@ -1035,7 +1035,7 @@ CONFIG_FEATURE_MIME_CHARSET=""
 #
 # Process Utilities
 #
-# CONFIG_FREE is not set
+CONFIG_FREE=y
 # CONFIG_FUSER is not set
 # CONFIG_IOSTAT is not set
 CONFIG_KILL=y
diff --git a/include/mingw.h b/include/mingw.h
index f16d086e2..c2a8b61bf 100644
--- a/include/mingw.h
+++ b/include/mingw.h
@@ -349,6 +349,28 @@ int mingw_fstat(int fd, struct mingw_stat *buf);
 #define fstat mingw_fstat
 
 /*
+ * sys/sysinfo.h
+ */
+struct sysinfo {
+        long uptime;             /* Seconds since boot */
+        unsigned long loads[3];  /* 1, 5, and 15 minute load averages */
+        unsigned long totalram;  /* Total usable main memory size */
+        unsigned long freeram;   /* Available memory size */
+        unsigned long sharedram; /* Amount of shared memory */
+        unsigned long bufferram; /* Memory used by buffers */
+        unsigned long totalswap; /* Total swap space size */
+        unsigned long freeswap;  /* Swap space still available */
+        unsigned short procs;    /* Number of current processes */
+        unsigned long totalhigh; /* Total high memory size */
+        unsigned long freehigh;  /* Available high memory size */
+        unsigned int mem_unit;   /* Memory unit size in bytes */
+        char _f[20-2*sizeof(long)-sizeof(int)];
+        /* Padding to 64 bytes */
+};
+
+int sysinfo(struct sysinfo *info);
+
+/*
  * sys/sysmacros.h
  */
 #define makedev(a,b) 0*(a)*(b) /* avoid unused warning */
diff --git a/procps/free.c b/procps/free.c
index 0adef501f..142786083 100644
--- a/procps/free.c
+++ b/procps/free.c
@@ -52,6 +52,7 @@ static unsigned long long scale(struct globals *g, unsigned long d)
         return ((unsigned long long)d * g->mem_unit) >> G_unit_steps;
 }
 
+#if !ENABLE_PLATFORM_MINGW32
 /* NOINLINE reduces main() stack usage, which makes code smaller (on x86 at least) */
 static NOINLINE unsigned int parse_meminfo(struct globals *g)
 {
@@ -78,6 +79,14 @@ static NOINLINE unsigned int parse_meminfo(struct globals *g)
 
         return seen_cached_and_available_and_reclaimable == 0;
 }
+#else
+static NOINLINE unsigned int parse_meminfo(struct globals *g)
+{
+        g->cached_kb = g->available_kb = g->reclaimable_kb = 0;
+
+        return 1;
+}
+#endif
 
 int free_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int free_main(int argc UNUSED_PARAM, char **argv IF_NOT_DESKTOP(UNUSED_PARAM))
@@ -135,9 +144,15 @@ int free_main(int argc UNUSED_PARAM, char **argv IF_NOT_DESKTOP(UNUSED_PARAM))
         }
 #endif
 
+#if !ENABLE_PLATFORM_MINGW32
 #define FIELDS_6 "%12llu %11llu %11llu %11llu %11llu %11llu\n"
 #define FIELDS_3 (FIELDS_6 + 6 + 7 + 7)
 #define FIELDS_2 (FIELDS_6 + 6 + 7 + 7 + 7)
+#else
+#define FIELDS_6 "%12I64u %11I64u %11I64u %11I64u %11I64u %11I64u\n"
+#define FIELDS_3 (FIELDS_6 + 7 + 8 + 8)
+#define FIELDS_2 (FIELDS_6 + 8 + 8 + 8 + 8)
+#endif
 
         printf(FIELDS_6,
                 scale(&G, info.totalram),                //total
diff --git a/win32/mingw.c b/win32/mingw.c
index 75635fdf1..48d2eefa7 100644
--- a/win32/mingw.c
+++ b/win32/mingw.c
@@ -1368,6 +1368,30 @@ int mingw_unlink(const char *pathname)
         return ret;
 }
 
+int sysinfo(struct sysinfo *info)
+{
+        DECLARE_PROC_ADDR(BOOL, GlobalMemoryStatusEx, LPMEMORYSTATUSEX);
+        MEMORYSTATUSEX mem;
+
+        memset((void *)info, 0, sizeof(struct sysinfo));
+
+        if (!INIT_PROC_ADDR(kernel32.dll, GlobalMemoryStatusEx)) {
+                return -1;
+        }
+
+        mem.dwLength = sizeof(MEMORYSTATUSEX);
+        if (!GlobalMemoryStatusEx(&mem))
+                return -1;
+
+        info->mem_unit = 1;
+        info->totalram = mem.ullTotalPhys;
+        info->freeram = mem.ullAvailPhys;
+        info->totalswap = mem.ullTotalPageFile - mem.ullTotalPhys;
+        info->freeswap = mem.ullAvailPageFile - mem.ullAvailPhys;
+
+        return 0;
+}
+
 #undef strftime
 size_t mingw_strftime(char *buf, size_t max, const char *format, const struct tm *tm)
 {