Merge branch 'master' into fontlib_loadfont

Author: mateoconlechuga

src/libc/clearerr.c

@@ -1,5 +1,7 @@
 #include "__fileioc_stdio.h"
 
+#include <stdint.h>
+
 void __attribute__((weak)) clearerr(FILE *stream)
 {
     if (stream == NULL ||
@@ -9,7 +11,7 @@ void __attribute__((weak)) clearerr(FILE *stream)
     {
         return;
     }
-
-    _file_streams[stream->slot].eof = 0;
-    _file_streams[stream->slot].err = 0;
+    uint8_t index = stream->slot - 1;
+    _file_streams[index].eof = 0;
+    _file_streams[index].err = 0;
 }

src/libc/fclose.c

@@ -1,5 +1,7 @@
 #include "__fileioc_stdio.h"
 
+#include <stdint.h>
+
 int __attribute__((weak)) fclose(FILE *stream)
 {
     ti_var_t slot;
@@ -14,8 +16,13 @@ int __attribute__((weak)) fclose(FILE *stream)
 
     slot = stream->slot;
 
-    _file_streams[slot - 1].slot = 0;
-
     int status = ti_Close(slot);
-    return (status == 0) ? EOF : 0;
+    if (status == 0)
+    {
+        // failed to close file
+        return EOF;
+    }
+    uint8_t index = slot - 1;
+    _file_streams[index].slot = 0;
+    return 0;
 }

src/libc/feof.c

@@ -2,5 +2,9 @@
 
 int __attribute__((weak)) feof(FILE *stream)
 {
+    if (stream == NULL || stream == stdin || stream == stdout || stream == stderr)
+    {
+        return 0;
+    }
     return stream->eof;
 }

src/libc/ferror.c

@@ -2,5 +2,9 @@
 
 int __attribute__((weak)) ferror(FILE *stream)
 {
+    if (stream == NULL || stream == stdin || stream == stdout || stream == stderr)
+    {
+        return 0;
+    }
     return stream->err;
 }

src/libc/fgetc.c

@@ -2,26 +2,17 @@
 
 int __attribute__((weak)) fgetc(FILE *stream)
 {
-    int c;
-
-    if (stream == NULL)
+    if (stream == NULL || stream == stdout || stream == stderr)
     {
         return EOF;
     }
-
-    if (stream == stdout || stream == stderr)
-    {
-        c = EOF;
-    }
-    else if (stream == stdin)
+    if (stream == stdin)
     {
-        c = getchar();
-    }
-    else
-    {
-        c = ti_GetC(stream->slot);
+        return getchar();
     }
 
+    int c = ti_GetC(stream->slot);
+
     if (c == EOF)
     {
         stream->eof = 1;

src/libc/fopen.c

@@ -5,15 +5,14 @@
 FILE* __attribute__((weak)) fopen(const char *__restrict filename, const char *__restrict mode)
 {
     ti_var_t slot;
-    uint8_t index;
 
     slot = ti_Open(filename, mode);
     if (slot == 0)
     {
         return NULL;
     }
 
-    index = slot - 1;
+    uint8_t index = slot - 1;
     _file_streams[index].slot = slot;
     _file_streams[index].eof = 0;
     _file_streams[index].err = 0;

src/libc/fputc.c

@@ -2,32 +2,21 @@
 
 int __attribute__((weak)) fputc(int c, FILE *stream)
 {
-    int ret;
-
-    if (stream == NULL)
+    if (stream == NULL || stream == stdin)
     {
         return EOF;
     }
-
-    if (stream == stdin)
+    if (stream == stdout || stream == stderr)
     {
-        ret = EOF;
-    }
-    else if (stream == stdout || stream == stderr)
-    {
-        ret = putchar(c);
-    }
-    else
-    {
-        ret = ti_PutC((char)c, stream->slot);
+        return putchar(c);
     }
 
+    int ret = ti_PutC((char)c, stream->slot);
+    /*
+     * `ti_PutC` returns `(unsigned char)c` or `EOF` so we can skip testing for
+     * the case of `ret != (unsigned char)c`
+     */
     if (ret == EOF)
-    {
-        stream->eof = 1;
-    }
-
-    if (ret != c)
     {
         stream->err = 1;
     }

src/libc/fread.c

@@ -2,11 +2,12 @@
 
 size_t __attribute__((weak)) fread(void *ptr, size_t size, size_t count, FILE *__restrict stream)
 {
-    size_t ncount;
-
-    if (stream == NULL ||
-        stream == stdout ||
-        stream == stderr)
+    if (stream == NULL || stream == stdout || stream == stderr)
+    {
+        return 0;
+    }
+    // If size or count is zero, fread returns zero and performs no other action.
+    if (size == 0 || count == 0)
     {
         return 0;
     }
@@ -16,6 +17,7 @@ size_t __attribute__((weak)) fread(void *ptr, size_t size, size_t count, FILE *_
         int c;
         char *p = ptr;
         size_t len = size * count;
+        size_t bytes_read = 0;
 
         for (; len > 0; len--)
         {
@@ -24,12 +26,13 @@ size_t __attribute__((weak)) fread(void *ptr, size_t size, size_t count, FILE *_
                 break;
             }
             *p++ = (char)c;
+            bytes_read++;
         }
 
-        return count;
+        return bytes_read / size;
     }
 
-    ncount = ti_Read(ptr, size, count, stream->slot);
+    size_t ncount = ti_Read(ptr, size, count, stream->slot);
     if (ncount != count)
     {
         stream->err = 1;

src/libc/fseek.c

@@ -1,6 +1,6 @@
 #include "__fileioc_stdio.h"
 
-int __attribute__((weak)) fseek(FILE *stream, long int offset, int origin)
+int __attribute__((weak)) fseek(FILE *stream, long offset, int origin)
 {
     if (stream == NULL ||
         stream == stdin ||
@@ -9,6 +9,5 @@ int __attribute__((weak)) fseek(FILE *stream, long int offset, int origin)
     {
         return -1;
     }
-
-    return ti_Seek((int)offset, origin, stream->slot);
+    return (ti_Seek((int)offset, origin, stream->slot) == EOF) ? -1 : 0;
 }

src/libc/ftell.c

@@ -1,7 +1,7 @@
 #include "__fileioc_stdio.h"
 #include <stdint.h>
 
-long int __attribute__((weak)) ftell(FILE *stream)
+long __attribute__((weak)) ftell(FILE *stream)
 {
     if (stream == NULL ||
         stream == stdin ||
@@ -14,5 +14,5 @@ long int __attribute__((weak)) ftell(FILE *stream)
     // ti_Tell shouldn't return a value greater than OS_VAR_MAX_SIZE (65512) unless an error occurs
     uint16_t ret = ti_Tell(stream->slot);
     // Convert a result of UINT16_MAX to -1L, leaving other results the same
-    return ((uint16_t)ret + 1) - 1L;
+    return (uint16_t)(ret + 1) - 1L;
 }