From 38610cd06dc0b5a3a4ee46f5fe7c341191aa2bc1 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Sat, 21 Dec 2019 12:25:14 +0100
Subject: Some userspace improvements

GAS is bad, NASM is awesome.
---
 src/userspace/mlibc/stdio/readline.c | 4 ++--
 src/userspace/mlibc/stdio/vprintf.c  | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'src/userspace/mlibc/stdio')

diff --git a/src/userspace/mlibc/stdio/readline.c b/src/userspace/mlibc/stdio/readline.c
index b948884..91b5da0 100644
--- a/src/userspace/mlibc/stdio/readline.c
+++ b/src/userspace/mlibc/stdio/readline.c
@@ -9,8 +9,8 @@ char *readline()
     while (buf != '\n') {
         buf = getch();
         writec(buf);
-        strcpy(ret, buf);
+        strcpy(ret, &buf);
     }
-    strcpy(ret, buf);
+    strcpy(ret, &buf);
     return ret;
 }
\ No newline at end of file
diff --git a/src/userspace/mlibc/stdio/vprintf.c b/src/userspace/mlibc/stdio/vprintf.c
index 92999b6..1d43c77 100644
--- a/src/userspace/mlibc/stdio/vprintf.c
+++ b/src/userspace/mlibc/stdio/vprintf.c
@@ -1,8 +1,6 @@
 #include <stdarg.h>
 #include <stdint.h>
 #include <mlibc/stdio.h>
-#include <mlibc/string.h>
-#include <mlibc/stdlib.h>
 #include <mlibc/stdlib.h>
 
 void __writes(const char *data)
@@ -32,12 +30,12 @@ void vprintf(const char *fmt, va_list args)
             } else if (buff == 'x') {
                 char *p = htoa((uint32_t) va_arg(args, int));
                 __writes(p);
-                // kfree(p);
+                free(p);
                 readyToFormat = 0;
             } else if (buff == 'd') {
                 char *p = itoa(va_arg(args, int));
                 __writes(p);
-                // kfree(p);
+                free(p);
                 readyToFormat = 0;
             } else if (buff == 'c') {
                 writec((char) va_arg(args, int));
-- 
cgit v1.2.3