summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorQuinn Stephens <quinn@osmora.org>2025-06-06 13:21:54 -0400
committerIan Moffett <ian@osmora.org>2025-06-07 18:17:10 -0400
commitf7ed50328af7b6a5151f86126a3491a768a7d1ff (patch)
treea26cb1e522d9177aab395b6214cf508167157cb6 /lib
parentd62d43fc5efa250317f2c7b1533ab3b6b048f9f1 (diff)
usr: libc: Add stdio read routines
Added fread(), fgetc(), getc(), and getchar() Signed-off-by: Quinn Stephens <quinn@osmora.org> Signed-off-by: Ian Moffett <ian@osmora.org>
Diffstat (limited to 'lib')
-rw-r--r--lib/libc/include/stdio.h5
-rw-r--r--lib/libc/src/stdio/fgetc.c55
-rw-r--r--lib/libc/src/stdio/fread.c61
3 files changed, 121 insertions, 0 deletions
diff --git a/lib/libc/include/stdio.h b/lib/libc/include/stdio.h
index b3bf8df..cdb9c14 100644
--- a/lib/libc/include/stdio.h
+++ b/lib/libc/include/stdio.h
@@ -68,14 +68,19 @@ extern FILE *stdout;
extern FILE *stderr;
#define putc(c, stream) fputc((c), (stream))
+#define getc(stream) fgetc((stream))
__BEGIN_DECLS
+size_t fread(void *__restrict ptr, size_t size, size_t n, FILE *__restrict stream);
size_t fwrite(const void *__restrict ptr, size_t size, size_t n, FILE *__restrict stream);
int fputc(int c, FILE *stream);
int putchar(int c);
+int fgetc(FILE *stream);
+int getchar(void);
+
#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
int fputs(const char *__restrict s, FILE *__restrict stream);
#else
diff --git a/lib/libc/src/stdio/fgetc.c b/lib/libc/src/stdio/fgetc.c
new file mode 100644
index 0000000..2ed8496
--- /dev/null
+++ b/lib/libc/src/stdio/fgetc.c
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2023-2025 Ian Marco Moffett and the Osmora Team.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Hyra nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+
+extern size_t __stdio_read(void *__restrict ptr, size_t size, FILE *__restrict stream);
+
+int
+fgetc(FILE *stream)
+{
+ uint16_t val;
+
+ if (stream == NULL) {
+ return EOF;
+ }
+
+ if (__stdio_read(&val, sizeof(val), stream) != sizeof(val)) {
+ return EOF;
+ }
+
+ return (int)val;
+}
+
+int
+getchar(void)
+{
+ return fgetc(stdin);
+}
diff --git a/lib/libc/src/stdio/fread.c b/lib/libc/src/stdio/fread.c
new file mode 100644
index 0000000..036962d
--- /dev/null
+++ b/lib/libc/src/stdio/fread.c
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2023-2025 Ian Marco Moffett and the Osmora Team.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Hyra nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdio.h>
+#include <unistd.h>
+
+size_t
+__stdio_read(void *__restrict ptr, size_t size, FILE *__restrict stream)
+{
+ ssize_t count;
+
+ if (stream->buf_mode == _IONBF) {
+ if ((count = read(stream->fd, ptr, size)) < 0) {
+ return 0;
+ }
+
+ return count;
+ }
+
+ /*
+ * TODO: Implement more buffering modes.
+ */
+
+ return 0;
+}
+
+size_t
+fread(void *__restrict ptr, size_t size, size_t n, FILE *__restrict stream)
+{
+ if (ptr == NULL || stream == NULL || (size * n) == 0) {
+ return 0;
+ }
+
+ return __stdio_read(ptr, size * n, stream);
+}