mingw: dummy implementation of times/sysconf

3 files changed, 36 insertions, 9 deletions

diff --git a/include/mingw.h b/include/mingw.h
index 9f2e192b5..ede7a72f5 100644
--- a/include/mingw.h
+++ b/include/mingw.h
@@ -307,10 +307,26 @@ int stime(time_t *t);
 #define strftime mingw_strftime
 
 /*
+ * times.h
+ */
+#define clock_t long
+
+struct tms {
+        clock_t tms_utime;              /* user CPU time */
+        clock_t tms_stime;              /* system CPU time */
+        clock_t tms_cutime;             /* user CPU time of children */
+        clock_t tms_cstime;             /* system CPU time of children */
+};
+
+clock_t times(struct tms *buf);
+
+/*
  * unistd.h
  */
 #define PIPE_BUF 8192
 
+#define _SC_CLK_TCK 2
+
 IMPL(alarm,unsigned int,0,unsigned int seconds UNUSED_PARAM);
 NOIMPL(chown,const char *path UNUSED_PARAM, uid_t uid UNUSED_PARAM, gid_t gid UNUSED_PARAM);
 NOIMPL(chroot,const char *root UNUSED_PARAM);
@@ -349,6 +365,7 @@ NOIMPL(seteuid,uid_t gid UNUSED_PARAM);
 unsigned int sleep(unsigned int seconds);
 NOIMPL(symlink,const char *oldpath UNUSED_PARAM, const char *newpath UNUSED_PARAM);
 static inline void sync(void) {}
+long sysconf(int name);
 NOIMPL(ttyname_r,int fd UNUSED_PARAM, char *buf UNUSED_PARAM, int sz UNUSED_PARAM);
 int mingw_unlink(const char *pathname);
 NOIMPL(vfork,void);
diff --git a/shell/ash.c b/shell/ash.c
index 40660dad5..3d9af3891 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -13278,8 +13278,6 @@ unsetcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
         return ret & 1;
 }
 
-#if !ENABLE_PLATFORM_MINGW32
-
 static const unsigned char timescmd_str[] ALIGN1 = {
         ' ',  offsetof(struct tms, tms_utime),
         '\n', offsetof(struct tms, tms_stime),
@@ -13311,13 +13309,6 @@ timescmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 
         return 0;
 }
-#else
-static int FAST_FUNC
-timescmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
-{
-        return 0;
-}
-#endif
 
 #if ENABLE_SH_MATH_SUPPORT
 /*
diff --git a/win32/mingw.c b/win32/mingw.c
index eb0f77a28..d5a4d6297 100644
--- a/win32/mingw.c
+++ b/win32/mingw.c
@@ -583,6 +583,25 @@ struct passwd *getpwuid(int uid UNUSED_PARAM)
         return &p;
 }
 
+long sysconf(int name)
+{
+        if ( name == _SC_CLK_TCK ) {
+                return 100;
+        }
+        errno = EINVAL;
+        return -1;
+}
+
+clock_t times(struct tms *buf)
+{
+        buf->tms_utime = 0;
+        buf->tms_stime = 0;
+        buf->tms_cutime = 0;
+        buf->tms_cstime = 0;
+
+        return 0;
+}
+
 static HANDLE timer_event;
 static HANDLE timer_thread;
 static int timer_interval;