aboutsummaryrefslogtreecommitdiff
path: root/src/userspace/programs
diff options
context:
space:
mode:
authorMarvin Borner2020-04-29 19:21:29 +0200
committerMarvin Borner2020-04-29 19:21:29 +0200
commit4546c75d685475d8b9f215b588364e1d1bbd0b79 (patch)
tree2077f72ad46dfe877f7febdd0692edc139fd7937 /src/userspace/programs
parent396d7d303d3bf0e796d0c817883ec1dec928352a (diff)
MUCH work in libc
Also cleaned up some syscalls etc
Diffstat (limited to 'src/userspace/programs')
-rw-r--r--src/userspace/programs/init.c4
-rw-r--r--src/userspace/programs/sh.c8
2 files changed, 7 insertions, 5 deletions
diff --git a/src/userspace/programs/init.c b/src/userspace/programs/init.c
index 91564c0..af4f5f1 100644
--- a/src/userspace/programs/init.c
+++ b/src/userspace/programs/init.c
@@ -1,9 +1,11 @@
+#include <stdio.h>
#include <syscall.h>
#include <gui.h>
void main()
{
- gui_init();
+ printf("Initializing userspace...\n");
+ //gui_init();
syscall_exec("/bin/sh");
while (1) {
diff --git a/src/userspace/programs/sh.c b/src/userspace/programs/sh.c
index 6dcb206..8da493e 100644
--- a/src/userspace/programs/sh.c
+++ b/src/userspace/programs/sh.c
@@ -1,13 +1,13 @@
#include <syscall.h>
+#include <stdio.h>
void main()
{
- syscall_putch('\n');
- syscall_putch('>');
- syscall_putch(' ');
+ printf("Test for printf! %d\n", 42);
+ printf("[~] ");
while (1) {
- syscall_putch(syscall_getch());
+ putch(getch());
}
syscall_halt();