8 files changed, 91 insertions, 3 deletions

diff --git a/procps/free.c b/procps/free.c
index d0c849b79..90b4af702 100644
--- a/procps/free.c
+++ b/procps/free.c
@@ -77,6 +77,7 @@ static const char *scale(struct globals *g, unsigned long d)
         return make_human_readable_str(d, g->mem_unit, G_unit);
 }
 
+#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)
 {
@@ -103,6 +104,14 @@ static NOINLINE unsigned int parse_meminfo(struct globals *g)
 
         return seen_cached_and_available_and_reclaimable == 0;
 }
+#else
+static 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))
diff --git a/procps/iostat.c b/procps/iostat.c
index d3157757f..2feb02456 100644
--- a/procps/iostat.c
+++ b/procps/iostat.c
@@ -28,7 +28,7 @@
 #if 1
 typedef unsigned long long cputime_t;
 typedef long long icputime_t;
-# define FMT_DATA "ll"
+# define FMT_DATA LL_FMT
 # define CPUTIME_MAX (~0ULL)
 #else
 typedef unsigned long cputime_t;
diff --git a/procps/kill.c b/procps/kill.c
index d4be18dd8..6be11296e 100644
--- a/procps/kill.c
+++ b/procps/kill.c
@@ -207,6 +207,7 @@ int kill_main(int argc UNUSED_PARAM, char **argv)
  do_it_now:
         pid = getpid();
 
+#if ENABLE_KILLALL5
         if (is_killall5) {
                 pid_t sid;
                 procps_status_t* p = NULL;
@@ -264,6 +265,7 @@ int kill_main(int argc UNUSED_PARAM, char **argv)
                         kill(-1, SIGCONT);
                 return errors;
         }
+#endif
 
 #if ENABLE_KILL || ENABLE_KILLALL
         /* Pid or name is required for kill/killall */
diff --git a/procps/mpstat.c b/procps/mpstat.c
index 795b4ccb7..d8158ef8f 100644
--- a/procps/mpstat.c
+++ b/procps/mpstat.c
@@ -49,7 +49,7 @@
 #if 1
 typedef unsigned long long data_t;
 typedef long long idata_t;
-#define FMT_DATA "ll"
+#define FMT_DATA LL_FMT
 #define DATA_MAX ULLONG_MAX
 #else
 typedef unsigned long data_t;
diff --git a/procps/pgrep.c b/procps/pgrep.c
index 04ae92a67..9773a72c4 100644
--- a/procps/pgrep.c
+++ b/procps/pgrep.c
@@ -30,31 +30,49 @@
 //kbuild:lib-$(CONFIG_PKILL) += pgrep.o
 
 //usage:#define pgrep_trivial_usage
+//usage:     IF_NOT_PLATFORM_MINGW32(
 //usage:       "[-flanovx] [-s SID|-P PPID|PATTERN]"
+//usage:     )
+//usage:     IF_PLATFORM_MINGW32(
+//usage:       "[-lvx] [-P PPID|PATTERN]"
+//usage:     )
 //usage:#define pgrep_full_usage "\n\n"
 //usage:       "Display process(es) selected by regex PATTERN\n"
 //usage:     "\n        -l      Show command name too"
+//usage:     IF_NOT_PLATFORM_MINGW32(
 //usage:     "\n        -a      Show command line too"
 //usage:     "\n        -f      Match against entire command line"
 //usage:     "\n        -n      Show the newest process only"
 //usage:     "\n        -o      Show the oldest process only"
+//usage:     )
 //usage:     "\n        -v      Negate the match"
 //usage:     "\n        -x      Match whole name (not substring)"
+//usage:     IF_NOT_PLATFORM_MINGW32(
 //usage:     "\n        -s      Match session ID (0 for current)"
+//usage:     )
 //usage:     "\n        -P      Match parent process ID"
 //usage:
 //usage:#define pkill_trivial_usage
+//usage:     IF_NOT_PLATFORM_MINGW32(
 //usage:       "[-l|-SIGNAL] [-xfvnoe] [-s SID|-P PPID|PATTERN]"
+//usage:     )
+//usage:     IF_PLATFORM_MINGW32(
+//usage:       "[-l|-SIGNAL] [-xve] [-P PPID|PATTERN]"
+//usage:     )
 //usage:#define pkill_full_usage "\n\n"
 //usage:       "Send signal to processes selected by regex PATTERN\n"
 //usage:     "\n        -l      List all signals"
 //usage:     "\n        -x      Match whole name (not substring)"
+//usage:     IF_NOT_PLATFORM_MINGW32(
 //usage:     "\n        -f      Match against entire command line"
 //usage:     "\n        -s SID  Match session ID (0 for current)"
+//usage:     )
 //usage:     "\n        -P PPID Match parent process ID"
 //usage:     "\n        -v      Negate the match"
+//usage:     IF_NOT_PLATFORM_MINGW32(
 //usage:     "\n        -n      Signal the newest process only"
 //usage:     "\n        -o      Signal the oldest process only"
+//usage:     )
 //usage:     "\n        -e      Display name and PID of the process being killed"
 
 #include "libbb.h"
@@ -68,25 +86,47 @@ enum {
         /* "vlafxones:+P:+" */
         OPTBIT_V = 0, /* must be first, we need OPT_INVERT = 0/1 */
         OPTBIT_L,
+#if !ENABLE_PLATFORM_MINGW32
         OPTBIT_A,
         OPTBIT_F,
+#else
+#define OPTBIT_A OPTBIT_L
+#endif
         OPTBIT_X,
+#if !ENABLE_PLATFORM_MINGW32
         OPTBIT_O,
         OPTBIT_N,
+#endif
         OPTBIT_E, /* should be pkill-only, do we care? */
+#if !ENABLE_PLATFORM_MINGW32
         OPTBIT_S,
+#endif
         OPTBIT_P,
 };
 
 #define OPT_INVERT      (opt & (1 << OPTBIT_V))
 #define OPT_LIST        (opt & (1 << OPTBIT_L))
+#if ENABLE_PLATFORM_MINGW32
+#define OPT_LISTFULL    (0)
+#define OPT_FULL        (0)
+#else
 #define OPT_LISTFULL    (opt & (1 << OPTBIT_A))
 #define OPT_FULL        (opt & (1 << OPTBIT_F))
+#endif
 #define OPT_ANCHOR      (opt & (1 << OPTBIT_X))
+#if ENABLE_PLATFORM_MINGW32
+#define OPT_FIRST       (0)
+#define OPT_LAST        (0)
+#else
 #define OPT_FIRST       (opt & (1 << OPTBIT_O))
 #define OPT_LAST        (opt & (1 << OPTBIT_N))
+#endif
 #define OPT_ECHO        (opt & (1 << OPTBIT_E))
+#if ENABLE_PLATFORM_MINGW32
+#define OPT_SID         (0)
+#else
 #define OPT_SID         (opt & (1 << OPTBIT_S))
+#endif
 #define OPT_PPID        (opt & (1 << OPTBIT_P))
 
 static void act(unsigned pid, char *cmd, int signo)
@@ -112,7 +152,12 @@ int pgrep_main(int argc UNUSED_PARAM, char **argv)
         unsigned opt;
         int scan_mask;
         int matched_pid;
+#if ENABLE_PLATFORM_MINGW32
+        const int sid2match = -1;
+        int ppid2match;
+#else
         int sid2match, ppid2match;
+#endif
         char *cmd_last;
         procps_status_t *proc;
         /* These are initialized to 0 */
@@ -137,8 +182,12 @@ int pgrep_main(int argc UNUSED_PARAM, char **argv)
 
         /* Parse remaining options */
         ppid2match = -1;
+#if !ENABLE_PLATFORM_MINGW32
         sid2match = -1;
         opt = getopt32(argv, "vlafxones:+P:+", &sid2match, &ppid2match);
+#else
+        opt = getopt32(argv, "vlxeP:+", &ppid2match);
+#endif
         argv += optind;
 
         if (pkill && OPT_LIST) { /* -l: print the whole signal list */
@@ -147,8 +196,10 @@ int pgrep_main(int argc UNUSED_PARAM, char **argv)
         }
 
         pid = getpid();
+#if !ENABLE_PLATFORM_MINGW32
         if (sid2match == 0)
                 sid2match = getsid(pid);
+#endif
 
         scan_mask = PSSCAN_COMM | PSSCAN_ARGV0;
         if (OPT_FULL)
@@ -180,6 +231,9 @@ int pgrep_main(int argc UNUSED_PARAM, char **argv)
                 }
 
                 cmdlen = -1;
+#if ENABLE_PLATFORM_MINGW32
+                cmd = proc->comm;
+#else
                 cmd = proc->argv0;
                 if (!cmd) {
                         cmd = proc->comm;
@@ -199,6 +253,7 @@ int pgrep_main(int argc UNUSED_PARAM, char **argv)
                                         cmd[i] = ' ';
                         }
                 }
+#endif
 
                 if (OPT_INVERT) {
                         /* "pgrep -v -P1 firefox" means "not (ppid=1 AND name=firefox)"
diff --git a/procps/ps.c b/procps/ps.c
index 5b521aebd..329576eb8 100644
--- a/procps/ps.c
+++ b/procps/ps.c
@@ -120,7 +120,7 @@ enum { MAX_WIDTH = 2*1024 };
 #if ENABLE_FEATURE_PS_TIME || ENABLE_FEATURE_PS_LONG
 static unsigned long get_uptime(void)
 {
-#ifdef __linux__
+#if defined __linux__ || ENABLE_PLATFORM_MINGW32
         struct sysinfo info;
         if (sysinfo(&info) < 0)
                 return 0;
@@ -237,10 +237,12 @@ static void func_comm(char *buf, int size, const procps_status_t *ps)
         safe_strncpy(buf, ps->comm, size+1);
 }
 
+#if !ENABLE_PLATFORM_MINGW32
 static void func_state(char *buf, int size, const procps_status_t *ps)
 {
         safe_strncpy(buf, ps->state, size+1);
 }
+#endif
 
 static void func_args(char *buf, int size, const procps_status_t *ps)
 {
@@ -257,6 +259,7 @@ static void func_ppid(char *buf, int size, const procps_status_t *ps)
         sprintf(buf, "%*u", size, ps->ppid);
 }
 
+#if !ENABLE_PLATFORM_MINGW32
 static void func_pgid(char *buf, int size, const procps_status_t *ps)
 {
         sprintf(buf, "%*u", size, ps->pgid);
@@ -293,6 +296,7 @@ static void func_tty(char *buf, int size, const procps_status_t *ps)
         if (ps->tty_major) /* tty field of "0" means "no tty" */
                 snprintf(buf, size+1, "%u,%u", ps->tty_major, ps->tty_minor);
 }
+#endif
 
 #if ENABLE_FEATURE_PS_ADDITIONAL_COLUMNS
 static void func_rgroup(char *buf, int size, const procps_status_t *ps)
@@ -379,11 +383,17 @@ static const ps_out_t out_spec[] ALIGN_PTR = {
 /* Mandated by http://pubs.opengroup.org/onlinepubs/9699919799/utilities/ps.html: */
         { 8                  , "user"  ,"USER"   ,func_user  ,PSSCAN_UIDGID  },
         { 8                  , "group" ,"GROUP"  ,func_group ,PSSCAN_UIDGID  },
+#if ENABLE_PLATFORM_MINGW32
+        { COMM_LEN           , "comm"  ,"COMMAND",func_comm  ,PSSCAN_COMM    },
+#else
         { 16                 , "comm"  ,"COMMAND",func_comm  ,PSSCAN_COMM    },
+#endif
         { MAX_WIDTH          , "args"  ,"COMMAND",func_args  ,PSSCAN_COMM    },
         { 5                  , "pid"   ,"PID"    ,func_pid   ,PSSCAN_PID     },
         { 5                  , "ppid"  ,"PPID"   ,func_ppid  ,PSSCAN_PPID    },
+#if !ENABLE_PLATFORM_MINGW32
         { 5                  , "pgid"  ,"PGID"   ,func_pgid  ,PSSCAN_PGID    },
+#endif
 #if ENABLE_FEATURE_PS_TIME
         { sizeof("ELAPSED")-1, "etime" ,"ELAPSED",func_etime ,PSSCAN_START_TIME },
 #endif
@@ -396,12 +406,14 @@ static const ps_out_t out_spec[] ALIGN_PTR = {
 #if ENABLE_FEATURE_PS_TIME
         { 5                  , "time"  ,"TIME"   ,func_time  ,PSSCAN_STIME | PSSCAN_UTIME },
 #endif
+#if !ENABLE_PLATFORM_MINGW32
         { 6                  , "tty"   ,"TT"     ,func_tty   ,PSSCAN_TTY     },
         { 4                  , "vsz"   ,"VSZ"    ,func_vsz   ,PSSCAN_VSZ     },
 /* Not mandated, but useful: */
         { 5                  , "sid"   ,"SID"    ,func_sid   ,PSSCAN_SID     },
         { 4                  , "stat"  ,"STAT"   ,func_state ,PSSCAN_STATE   },
         { 4                  , "rss"   ,"RSS"    ,func_rss   ,PSSCAN_RSS     },
+#endif
 #if ENABLE_SELINUX
         { 35                 , "label" ,"LABEL"  ,func_label ,PSSCAN_CONTEXT },
 #endif
@@ -544,6 +556,8 @@ static void format_process(const procps_status_t *ps)
 #if ENABLE_SELINUX
 # define SELINUX_O_PREFIX "label,"
 # define DEFAULT_O_STR    (SELINUX_O_PREFIX "pid,user" IF_FEATURE_PS_TIME(",time") ",args")
+#elif ENABLE_PLATFORM_MINGW32
+# define DEFAULT_O_STR    ("pid,ppid,user" IF_FEATURE_PS_TIME(",time,etime") ",args")
 #else
 # define DEFAULT_O_STR    ("pid,user" IF_FEATURE_PS_TIME(",time") ",args")
 #endif
diff --git a/procps/smemcap.c b/procps/smemcap.c
index a2231788b..6839c9de0 100644
--- a/procps/smemcap.c
+++ b/procps/smemcap.c
@@ -19,6 +19,7 @@
 //kbuild:lib-$(CONFIG_SMEMCAP) += smemcap.o
 
 #include "libbb.h"
+#define BB_ARCHIVE_PUBLIC
 #include "bb_archive.h"
 
 struct fileblock {
diff --git a/procps/watch.c b/procps/watch.c
index 05b72723c..d7c3ad55e 100644
--- a/procps/watch.c
+++ b/procps/watch.c
@@ -71,9 +71,16 @@ int watch_main(int argc UNUSED_PARAM, char **argv)
 
         // watch from both procps 2.x and 3.x does concatenation. Example:
         // watch ls -l "a /tmp" "2>&1" - ls won't see "a /tmp" as one param
+#if ENABLE_PLATFORM_MINGW32
+        cmd = NULL;
+        do {
+                cmd = xappendword(cmd, *argv);
+        } while (*++argv);
+#else
         cmd = *argv;
         while (*++argv)
                 cmd = xasprintf("%s %s", cmd, *argv); // leaks cmd
+#endif
 
         period = parse_duration_str(period_str);
         width = (unsigned)-1; // make sure first time new_width != width