From dbdaa77fb5924b4b9e6b374a44ef76481a38d3d2 Mon Sep 17 00:00:00 2001
From: aqua <aqua@iserlohn-fortress.net>
Date: Tue, 8 Nov 2022 17:19:45 +0200
Subject: Add FILE struct

---
 lib/stdio/fprintf.c  | 11 +++++++++
 lib/stdio/printf.c   | 69 ++++------------------------------------------------
 lib/stdio/vfprintf.c | 54 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 70 insertions(+), 64 deletions(-)
 create mode 100644 lib/stdio/fprintf.c
 create mode 100644 lib/stdio/vfprintf.c

(limited to 'lib/stdio')

diff --git a/lib/stdio/fprintf.c b/lib/stdio/fprintf.c
new file mode 100644
index 0000000..9a96dc6
--- /dev/null
+++ b/lib/stdio/fprintf.c
@@ -0,0 +1,11 @@
+#include <stdio.h>
+
+int
+fprintf(FILE *restrict stream, const char *restrict format, ...)
+{
+  va_list ap;
+  va_start(ap, format);
+  int c = vfprintf(stream, format, ap);
+  va_end(ap);
+  return c;
+}
diff --git a/lib/stdio/printf.c b/lib/stdio/printf.c
index ae4d5b1..4efc1ac 100644
--- a/lib/stdio/printf.c
+++ b/lib/stdio/printf.c
@@ -1,70 +1,11 @@
-#include <stdarg.h>
 #include <stdio.h>
-#include <string.h>
-
-#include <devices/uart_16550.h>
-#include <devices/vga.h>
-
-static char buffer[3 * sizeof(int) + 2];
 
 int
 printf(const char *restrict format, ...)
 {
-  int written = 0;
-  va_list params;
-  va_start(params, format);
-
-  int s = 0;
-  int l = 0;
-  for (int i = 0; format[i] != '\0'; ++i) {
-    if (format[i] == '%') {
-      written += uart_puts(COM1, &format[s], l);
-      vga_puts(&format[s], l);
-      s = i + 2;
-      ++i;
-
-      switch (format[i]) {
-      case 's': {
-        const char *arg = va_arg(params, const char *);
-        written += uart_puts(COM1, arg, -1);
-        vga_puts(arg, -1);
-      } break;
-      case 'c': {
-        const int arg = va_arg(params, int);
-        uart_write(COM1, arg);
-        vga_putc(arg);
-        ++written;
-      } break;
-      case 'd': {
-        const char *arg = itoa(buffer, va_arg(params, int), 10);
-        written += uart_puts(COM1, arg, -1);
-        vga_puts(arg, -1);
-      } break;
-      case 'u': {
-        const char *arg = utoa(buffer, va_arg(params, unsigned int), 10);
-        written += uart_puts(COM1, arg, -1);
-        vga_puts(arg, -1);
-      } break;
-      case 'x': {
-        const char *arg = utoa(buffer, va_arg(params, unsigned int), 16);
-        written += uart_puts(COM1, arg, -1);
-        vga_puts(arg, -1);
-      } break;
-      }
-
-      l = 0;
-    }
-
-    else
-      ++l;
-  }
-
-  if (l > 0) {
-    written += uart_puts(COM1, &format[s], l);
-    vga_puts(&format[s], l);
-  }
-
-  va_end(params);
-  vga_update_cursor();
-  return written;
+  va_list ap;
+  va_start(ap, format);
+  int c = vfprintf(stdout, format, ap);
+  va_end(ap);
+  return c;
 }
diff --git a/lib/stdio/vfprintf.c b/lib/stdio/vfprintf.c
new file mode 100644
index 0000000..d24e43e
--- /dev/null
+++ b/lib/stdio/vfprintf.c
@@ -0,0 +1,54 @@
+#include <stdio.h>
+#include <string.h>
+
+static char buffer[3 * sizeof(int) + 2];
+
+int
+vfprintf(FILE *restrict stream, const char *restrict format, va_list params)
+{
+  int written = 0;
+
+  int s = 0;
+  int l = 0;
+  for (int i = 0; format[i] != '\0'; ++i) {
+    if (format[i] == '%') {
+      written += stream->puts(stream, &format[s], l);
+      s = i + 2;
+      ++i;
+
+      switch (format[i]) {
+      case 's': {
+        const char *arg = va_arg(params, const char *);
+        written += stream->puts(stream, arg, -1);
+      } break;
+      case 'c': {
+        const int arg = va_arg(params, int);
+        stream->putc(stream, arg);
+        ++written;
+      } break;
+      case 'd': {
+        const char *arg = itoa(buffer, va_arg(params, int), 10);
+        written += stream->puts(stream, arg, -1);
+      } break;
+      case 'u': {
+        const char *arg = utoa(buffer, va_arg(params, unsigned int), 10);
+        written += stream->puts(stream, arg, -1);
+      } break;
+      case 'x': {
+        const char *arg = utoa(buffer, va_arg(params, unsigned int), 16);
+        written += stream->puts(stream, arg, -1);
+      } break;
+      }
+
+      l = 0;
+    }
+
+    else
+      ++l;
+  }
+
+  if (l > 0) { written += stream->puts(stream, &format[s], l); }
+
+  stream->flush(stream);
+  return written;
+}
-- 
cgit v1.2.1