1 files changed, 15 insertions, 1 deletions

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