Implement times and clearerr

Author: streaksu

PORTING.md

@@ -55,6 +55,7 @@ and their locations:
     - POSIX-compatible `tcsetattr`.
     - POSIX-compatible `tcflow`.
     - POSIX-compatible `fchmod`.
+    - POSIX-compatible `times`.
     - All the desired optional functions.
 - A declaration of `sys_siglist` and `sys_nsig`.
 
@@ -65,8 +66,8 @@ syscall interface, for example.
 - A `sys` directory under `source/ports/X-Y/sys`, which will be installed
 verbatim with the final instalation under `sys`, containing:
     - The definition of the `errnoval.h`, `fcntlval.h`, `timeval.h`, `statval.h`
-    `signalval.h`, `termiosval.h`, and `ioctlval.h` headers, which define values
-    taken by several functions that are by nature OS dependent.
+    `signalval.h`, `termiosval.h`, `timesval.h` and `ioctlval.h` headers, which
+    define values taken by several functions that are by nature OS dependent.
     - The `types` header, since the types and values are part of the OS ABI.
     - Any desired optional headers. for optional declarations or values. 
 

source/include/stdio.h

@@ -46,6 +46,7 @@ size_t fwrite(const void *pointer, size_t size, size_t nitems, FILE *stream);
 size_t fread(void *pointer, size_t size, size_t nitems, FILE *stream);
 int    feof(FILE *stream);
 int    ferror(FILE *stream);
+void   clearerr(FILE *stream);
 int    fileno(FILE *stream);
 int    putchar(int character);
 int    getchar(void);

source/include/sys/times.h

@@ -0,0 +1,17 @@
+#ifndef __SYS__TIMES_H__
+#define __SYS__TIMES_H__
+
+#include <sys/types.h>
+#include <sys/timesval.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+clock_t times(struct tms *t); // Defined by port.
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

source/libc/stdio/file.c

@@ -280,6 +280,11 @@ int ferror(FILE *stream) {
     return stream->is_error;
 }
 
+void clearerr(FILE *stream) {
+    stream->is_eof   = 0;
+    stream->is_error = 1;
+}
+
 int fileno(FILE *stream) {
     return stream->inner_fd;
 }

source/ports/i686-echidnaos/sys/fcntlval.h

@@ -17,7 +17,8 @@ extern "C" {
 #define SEEK_END 1
 #define SEEK_CUR 2
 
-#define F_SETFD 69 // Placeholder.
+#define F_SETFD 69 // Placeholder cuz echidnaOS has no fcntl.
+#define F_DUPFD 69 // Placeholder cuz echidnaOS has no fcntl.
 
 #define F_OK 1
 #define R_OK 2

source/ports/i686-echidnaos/sys/timesval.h

@@ -0,0 +1,19 @@
+#ifndef __SYS__TIMESVAL_H__
+#define __SYS__TIMESVAL_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct tms {
+    clock_t tms_utime;
+    clock_t tms_stime;
+    clock_t tms_cutime;
+    clock_t tms_cstime;
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

source/ports/i686-echidnaos/sys/types.h

@@ -21,6 +21,7 @@ typedef int32_t pid_t;
 typedef int32_t off_t;
 typedef int32_t ssize_t;
 typedef int32_t clockid_t;
+typedef int32_t clock_t;
 
 #ifdef __cplusplus
 }

source/ports/i686-echidnaos/sysdeps.c

@@ -5,6 +5,7 @@
 #include <assert.h>
 #include <sys/api.h>
 #include <sys/stat.h>
+#include <sys/times.h>
 #include <time.h>
 #include <stropts.h>
 #include <termios.h>
@@ -311,3 +312,10 @@ int fchmod(int fd, mode_t mode) {
     assert(!"This is a stub");
     return -1;
 }
+
+clock_t times(struct tms *t) {
+    // TODO: Implement when echidnaOS supports it.
+    (void)t;
+    assert(!"This is a stub");
+    return (clock_t)-1;
+}

source/ports/x86_64-linux/sys/timesval.h

@@ -0,0 +1,19 @@
+#ifndef __SYS__TIMESVAL_H__
+#define __SYS__TIMESVAL_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct tms {
+    clock_t tms_utime;
+    clock_t tms_stime;
+    clock_t tms_cutime;
+    clock_t tms_cstime;
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

source/ports/x86_64-linux/sys/types.h

@@ -21,6 +21,7 @@ typedef int32_t  pid_t;
 typedef int64_t  off_t;
 typedef int64_t  ssize_t;
 typedef int32_t  clockid_t;
+typedef int64_t  clock_t;
 
 #ifdef __cplusplus
 }