add <unistd.h>, isatty, and fileno

Author: ZERICO2005

src/libc/__fileioc_stdio.h

@@ -4,11 +4,42 @@
 #include <cdefs.h>
 #include <fileioc.h>
 #include <stdio.h>
+#include <stdbool.h>
+
+/*
+ * fd mapping:
+ * STDIN_FILENO = 0
+ * STDOUT_FILENO = 1
+ * STDERR_FILENO = 2
+ * fileioc slot 1 = 3
+ * fileioc slot 2 = 4
+ * fileioc slot 3 = 5
+ * fileioc slot 4 = 6
+ * fileioc slot 5 = 7
+ */
 
 __BEGIN_DECLS
 
 extern FILE _file_streams[FOPEN_MAX];
 
+#define FILEIOC_MIN_FD_SLOT 3
+#define FILEIOC_MAX_FD_SLOT (FILEIOC_MIN_FD_SLOT + (FOPEN_MAX - 1))
+
+static inline int fileioc_slot_to_fd(ti_var_t slot)
+{
+    return (int)(slot + (FILEIOC_MIN_FD_SLOT - 1));
+}
+
+static inline ti_var_t fd_to_fileioc_slot(int fd)
+{
+    return (ti_var_t)(fd - (FILEIOC_MIN_FD_SLOT - 1));
+}
+
+static inline bool is_fd_a_fileioc_slot(int fd)
+{
+    return (fd >= FILEIOC_MIN_FD_SLOT && fd <= FILEIOC_MAX_FD_SLOT);
+}
+
 __END_DECLS
 
 #endif /* __FILEIOC_STDIO_H */

src/libc/fileno.c

@@ -0,0 +1,28 @@
+#include "__fileioc_stdio.h"
+#include <errno.h>
+#include <unistd.h>
+
+int __attribute__((weak)) fileno(FILE *stream)
+{
+    if (stream == NULL)
+    {
+        // invalid stream
+        errno = EBADF;
+        return -1;
+    }
+
+    if (stream == stdin)
+    {
+        return STDIN_FILENO;
+    }
+    if (stream == stdout)
+    {
+        return STDOUT_FILENO;
+    }
+    if (stream == stderr)
+    {
+        return STDERR_FILENO;
+    }
+
+    return fileioc_slot_to_fd(stream->slot);
+}

src/libc/include/stdio.h

@@ -81,6 +81,8 @@ int remove(const char *filename);
 
 int rename(const char *old_filename, const char *new_filename);
 
+int fileno(FILE *stream);
+
 /* standard impls */
 
 int getchar(void);

src/libc/include/unistd.h

@@ -0,0 +1,16 @@
+#ifndef _UNISTD_H
+#define _UNISTD_H
+
+#include <cdefs.h>
+
+#define STDIN_FILENO 0
+#define STDOUT_FILENO 1
+#define STDERR_FILENO 2
+
+__BEGIN_DECLS
+
+int isatty(int fd);
+
+__END_DECLS
+
+#endif /* _UNISTD_H */

src/libc/isatty.c

@@ -0,0 +1,20 @@
+#include "__fileioc_stdio.h"
+#include <unistd.h>
+#include <errno.h>
+
+int __attribute__((weak)) isatty(int fd)
+{
+    if (fd == STDIN_FILENO || fd == STDOUT_FILENO || fd == STDERR_FILENO)
+    {
+        return 1;
+    }
+    if (is_fd_a_fileioc_slot(fd))
+    {
+        // not a terminal
+        errno = ENOTTY;
+        return 0;
+    }
+    // invalid fd
+    errno = EBADF;
+    return 0;
+}

test/standalone/fileno/autotest.json

@@ -0,0 +1,37 @@
+{
+  "transfer_files":
+  [
+    "bin/DEMO.8xp"
+  ],
+  "target":
+  {
+    "name": "DEMO",
+    "isASM": true
+  },
+  "sequence":
+  [
+    "action|launch",
+    "delay|500",
+    "hashWait|1",
+    "key|enter",
+    "delay|300",
+    "hashWait|2"
+  ],
+  "hashes":
+  {
+    "1":
+    {
+      "description": "All tests passed",
+      "start": "vram_start",
+      "size": "vram_16_size",
+      "expected_CRCs": [ "38E2AD5A" ]
+    },
+    "2":
+    {
+      "description": "Test homescreen cleared",
+      "start": "vram_start",
+      "size": "vram_16_size",
+      "expected_CRCs": [ "FFAF89BA", "101734A5", "9DA19F44", "A32840C8", "349F4775" ]
+    }
+  }
+}

test/standalone/fileno/makefile

@@ -0,0 +1,16 @@
+# ----------------------------
+# Makefile Options
+# ----------------------------
+
+NAME = DEMO
+ICON = icon.png
+DESCRIPTION = "CE C Toolchain Demo"
+COMPRESSED = NO
+ARCHIVED = NO
+
+CFLAGS = -Wall -Wextra -ffreestanding -Oz
+CXXFLAGS = -Wall -Wextra -ffreestanding -Oz
+
+# ----------------------------
+
+include $(shell cedev-config --makefile)

test/standalone/fileno/src/main.cpp

@@ -0,0 +1,129 @@
+#include <stdbool.h>
+#include <stdio.h>
+#include <ti/screen.h>
+#include <ti/getcsc.h>
+#include <ti/sprintf.h>
+#include <sys/util.h>
+#include <errno.h>
+#include <unistd.h>
+#include <stdint.h>
+#include <algorithm>
+
+#define C(expr) if (!(expr)) { return __LINE__; }
+
+static const char *name_1 = "foo1";
+static const char *name_2 = "bar2";
+
+constexpr int FILEIOC_SLOT_COUNT = 5;
+constexpr int MIN_FILEIOC_SLOT = 1 + std::max(STDIN_FILENO, std::max(STDOUT_FILENO, STDERR_FILENO));
+constexpr int MAX_FILEIOC_SLOT = MIN_FILEIOC_SLOT + (FILEIOC_SLOT_COUNT - 1);
+
+static bool is_fileioc_fd(int fd) {
+    if (fd == STDIN_FILENO || fd == STDOUT_FILENO || fd == STDERR_FILENO) {
+        return false;
+    }
+    return (fd >= MIN_FILEIOC_SLOT && fd <= MAX_FILEIOC_SLOT);
+}
+
+int run_tests(void) {
+
+    // create some files
+    FILE *file_1 = fopen(name_1, "w");
+    C(file_1 != NULL);
+    FILE *file_2 = fopen(name_2, "a+");
+    C(file_2 != NULL);
+
+    C(errno == 0);
+
+    // test fileno
+
+    int fileno_1 = fileno(file_1);
+    C(is_fileioc_fd(fileno_1));
+    int fileno_2 = fileno(file_2);
+    C(is_fileioc_fd(fileno_2));
+
+    C(fileno_1 != fileno_2);
+    C(errno == 0);
+
+    int fileno_stdin = fileno(stdin);
+    int fileno_stdout = fileno(stdout);
+    int fileno_stderr = fileno(stderr);
+
+    C(fileno_stdin == STDIN_FILENO);
+    C(fileno_stdout == STDOUT_FILENO);
+
+    // we current define stdout to be stderr
+    if (stdout != stderr) {
+        C(fileno_stderr == STDERR_FILENO);
+    } else {
+        C(fileno_stderr == STDOUT_FILENO);
+    }
+    C(errno == 0);
+
+    int fileno_nullptr = fileno(nullptr);
+    C(fileno_nullptr == -1);
+    C(errno == EBADF);
+
+    errno = 0;
+
+    // we currently treat stdin/stdout/stderr as a tty/terminal
+    C(isatty(fileno_stdin) == 1);
+    C(isatty(fileno_stdout) == 1);
+    C(isatty(fileno_stderr) == 1);
+    C(errno == 0);
+
+    // test invalid fd
+    C(isatty(-1) == 0);
+    C(errno == EBADF);
+    errno = 0;
+    C(isatty(MAX_FILEIOC_SLOT + 1) == 0);
+    C(errno == EBADF);
+    errno = 0;
+
+    // test valid fd that are not a terminal
+    C(isatty(fileno_1) == 0);
+    C(errno == ENOTTY);
+    errno = 0;
+    C(isatty(fileno_2) == 0);
+    C(errno == ENOTTY);
+    errno = 0;
+
+    // remove the files
+    C(fclose(file_1) == 0);
+    file_1 = fopen(name_1, "r+");
+    C(file_1 != NULL);
+    C(fclose(file_2) == 0);
+    C(remove(name_2) == 0);
+    C(fclose(file_1) == 0);
+    C(remove(name_1) == 0);
+    C(errno == 0);
+
+    // attempt to read a removed file
+    file_1 = fopen(name_1, "r");
+    C(file_1 == NULL);
+
+    // discard errno value
+    errno = 0;
+
+    return 0;
+}
+
+extern "C" int main(void) {
+    os_ClrHome();
+    errno = 0;
+    int failed_test = run_tests();
+    if (errno != 0) {
+        perror("errno");
+    }
+    if (failed_test != 0) {
+        char buf[sizeof("Failed test L-8388608")];
+        boot_sprintf(buf, "Failed test L%d", failed_test);
+        puts(buf);
+    } else {
+        puts("All tests passed");
+    }
+
+    while (!os_GetCSC());
+
+    return 0;
+}