3 files changed, 39 insertions, 0 deletions

diff --git a/include/libbb.h b/include/libbb.h
index 31e733d77..e82954fd0 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -1466,6 +1466,9 @@ typedef struct procps_status_t {
 #if ENABLE_FEATURE_TOP_SMP_PROCESS
         int last_seen_on_cpu;
 #endif
+#if ENABLE_PLATFORM_MINGW32
+        HANDLE snapshot;
+#endif
 } procps_status_t;
 /* flag bits for procps_scan(xx, flags) calls */
 enum {
diff --git a/libbb/procps.c b/libbb/procps.c
index 14d4481bd..7ffcd8dbc 100644
--- a/libbb/procps.c
+++ b/libbb/procps.c
@@ -75,6 +75,7 @@ const char* FAST_FUNC get_cached_groupname(gid_t gid)
         return get_cached(&groupname, gid, gid2group_utoa);
 }
 
+#if !ENABLE_PLATFORM_MINGW32
 
 #define PROCPS_BUFSIZE 1024
 
@@ -552,6 +553,8 @@ procps_status_t* FAST_FUNC procps_scan(procps_status_t* sp, int flags)
         return sp;
 }
 
+#endif  /* ENABLE_PLATFORM_MINGW32 */
+
 void FAST_FUNC read_cmdline(char *buf, int col, unsigned pid, const char *comm)
 {
         int sz;
diff --git a/win32/process.c b/win32/process.c
index 13bf81797..1b9b61878 100644
--- a/win32/process.c
+++ b/win32/process.c
@@ -1,4 +1,5 @@
 #include "libbb.h"
+#include <tlhelp32.h>
 
 int waitpid(pid_t pid, int *status, unsigned options)
 {
@@ -284,3 +285,35 @@ mingw_execv(const char *cmd, const char *const *argv)
 {
         return mingw_execve(cmd, argv, (const char *const *)environ);
 }
+
+/* POSIX version in libbb/procps.c */
+procps_status_t* FAST_FUNC procps_scan(procps_status_t* sp, int flags)
+{
+        PROCESSENTRY32 pe;
+
+        pe.dwSize = sizeof(pe);
+        if (!sp) {
+                sp = xzalloc(sizeof(struct procps_status_t));
+                sp->snapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
+                if (sp->snapshot == INVALID_HANDLE_VALUE) {
+                        free(sp);
+                        return NULL;
+                }
+                if (!Process32First(sp->snapshot, &pe)) {
+                        CloseHandle(sp->snapshot);
+                        free(sp);
+                        return NULL;
+                }
+        }
+        else {
+                if (!Process32Next(sp->snapshot, &pe)) {
+                        CloseHandle(sp->snapshot);
+                        free(sp);
+                        return NULL;
+                }
+        }
+
+        sp->pid = pe.th32ProcessID;
+        strncpy(sp->comm, pe.szExeFile, COMM_LEN);
+        return sp;
+}