Fixed several warnings, errors and dumb bugs

16 files changed, 31 insertions, 25 deletions

diff --git a/src/userspace/libc/stdio/puts.c b/src/userspace/libc/stdio/puts.c
index a4fd3ea..979dd0a 100644
--- a/src/userspace/libc/stdio/puts.c
+++ b/src/userspace/libc/stdio/puts.c
@@ -4,6 +4,6 @@
 
 void puts(char *data)
 {
-	for (u8 i = 0; i < strlen(data); i++)
+	for (u32 i = 0; i < strlen(data); i++)
 		putch(data[i]);
 }
\ No newline at end of file
diff --git a/src/userspace/libc/stdlib.h b/src/userspace/libc/stdlib.h
index 4140c4c..583df15 100644
--- a/src/userspace/libc/stdlib.h
+++ b/src/userspace/libc/stdlib.h
@@ -12,7 +12,7 @@ int htoi(char *str);
 // Exit functions
 
 // Memory management
-void *malloc(u8 size);
+void *malloc(u32 size);
 void free(void *addr);
 
 #endif
\ No newline at end of file
diff --git a/src/userspace/libc/stdlib/atoi.c b/src/userspace/libc/stdlib/atoi.c
index 21b6c25..dbfe0cb 100644
--- a/src/userspace/libc/stdlib/atoi.c
+++ b/src/userspace/libc/stdlib/atoi.c
@@ -5,15 +5,15 @@
 
 int atoi(char *str)
 {
-	u8 s_str = strlen(str);
+	u32 s_str = strlen(str);
 	if (!s_str)
 		return 0;
 
-	u8 negative = 0;
+	u32 negative = 0;
 	if (str[0] == '-')
 		negative = 1;
 
-	u8 i = 0;
+	u32 i = 0;
 	if (negative)
 		i++;
 
diff --git a/src/userspace/libc/stdlib/htoi.c b/src/userspace/libc/stdlib/htoi.c
index cf79b7a..8897d20 100644
--- a/src/userspace/libc/stdlib/htoi.c
+++ b/src/userspace/libc/stdlib/htoi.c
@@ -5,9 +5,9 @@
 
 int htoi(char *str)
 {
-	u8 s_str = strlen(str);
+	u32 s_str = strlen(str);
 
-	u8 i = 0;
+	u32 i = 0;
 	int ret = 0;
 	for (; i < s_str; i++) {
 		char c = str[i];
diff --git a/src/userspace/libc/stdlib/itoa.c b/src/userspace/libc/stdlib/itoa.c
index 8311ad1..b8aa73e 100644
--- a/src/userspace/libc/stdlib/itoa.c
+++ b/src/userspace/libc/stdlib/itoa.c
@@ -13,7 +13,7 @@ char *itoa(int n)
 		ret[1] = 0;
 		return ret;
 	}
-	u8 negative = (u8)(n < 0);
+	u32 negative = (u32)(n < 0);
 	if (negative)
 		n *= -1;
 
diff --git a/src/userspace/libc/stdlib/malloc.c b/src/userspace/libc/stdlib/malloc.c
index b738eed..5eb3caa 100644
--- a/src/userspace/libc/stdlib/malloc.c
+++ b/src/userspace/libc/stdlib/malloc.c
@@ -1,7 +1,7 @@
 #include <stdint.h>
 #include <syscall.h>
 
-void *malloc(u8 size)
+void *malloc(u32 size)
 {
 	return (void *)syscall_malloc(size);
 }
\ No newline at end of file
diff --git a/src/userspace/libc/string.h b/src/userspace/libc/string.h
index 10b7688..2eb2fb6 100644
--- a/src/userspace/libc/string.h
+++ b/src/userspace/libc/string.h
@@ -4,7 +4,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-u8 strlen(char *str);
+u32 strlen(char *str);
 
 void strcpy(char *dest, char *orig);
 
diff --git a/src/userspace/libc/string/strcat.c b/src/userspace/libc/string/strcat.c
index f62d6e2..bb8f09b 100644
--- a/src/userspace/libc/string/strcat.c
+++ b/src/userspace/libc/string/strcat.c
@@ -3,10 +3,10 @@
 
 void strcat(char *dest, char *orig)
 {
-	u8 s_dest = strlen(dest);
-	u8 s_orig = strlen(orig);
+	u32 s_dest = strlen(dest);
+	u32 s_orig = strlen(orig);
 
-	for (u8 i = 0; i < s_orig; i++)
+	for (u32 i = 0; i < s_orig; i++)
 		dest[s_dest + i] = orig[i];
 	dest[s_dest + s_orig] = 0;
 }
\ No newline at end of file
diff --git a/src/userspace/libc/string/strcati.c b/src/userspace/libc/string/strcati.c
index 5da986d..d82fbfc 100644
--- a/src/userspace/libc/string/strcati.c
+++ b/src/userspace/libc/string/strcati.c
@@ -3,8 +3,8 @@
 
 void strcati(char *dest, char *orig)
 {
-	u8 s_orig = strlen(orig);
+	u32 s_orig = strlen(orig);
 	strdisp(dest, (int)s_orig);
-	for (u8 i = 0; i < s_orig; i++)
+	for (u32 i = 0; i < s_orig; i++)
 		dest[i] = orig[i];
 }
\ No newline at end of file
diff --git a/src/userspace/libc/string/strcmp.c b/src/userspace/libc/string/strcmp.c
index 4282520..932877d 100644
--- a/src/userspace/libc/string/strcmp.c
+++ b/src/userspace/libc/string/strcmp.c
@@ -6,7 +6,7 @@ char strcmp(char *a, char *b)
 	if (strlen(a) != strlen(b))
 		return 1;
 
-	for (u8 i = 0; i < strlen(a); i++)
+	for (u32 i = 0; i < strlen(a); i++)
 		if (a[i] != b[i])
 			return 1;
 
diff --git a/src/userspace/libc/string/strcpy.c b/src/userspace/libc/string/strcpy.c
index 733f7ba..a12d3e0 100644
--- a/src/userspace/libc/string/strcpy.c
+++ b/src/userspace/libc/string/strcpy.c
@@ -3,9 +3,9 @@
 
 void strcpy(char *dest, char *orig)
 {
-	u8 s_orig = strlen(orig);
+	u32 s_orig = strlen(orig);
 
-	for (u8 i = 0; i < s_orig; i++)
+	for (u32 i = 0; i < s_orig; i++)
 		dest[i] = orig[i];
 	dest[s_orig] = 0;
 }
\ No newline at end of file
diff --git a/src/userspace/libc/string/strdisp.c b/src/userspace/libc/string/strdisp.c
index 7e8c05a..88815ef 100644
--- a/src/userspace/libc/string/strdisp.c
+++ b/src/userspace/libc/string/strdisp.c
@@ -3,7 +3,7 @@
 
 void strdisponce(char *str)
 {
-	for (u8 i = sizeof(str) + 2; i > 0; i--)
+	for (u32 i = sizeof(str) + 2; i > 0; i--)
 		str[i] = str[i - 1];
 	str[0] = 0;
 }
diff --git a/src/userspace/libc/string/strdup.c b/src/userspace/libc/string/strdup.c
index f2a7c35..a42b02d 100644
--- a/src/userspace/libc/string/strdup.c
+++ b/src/userspace/libc/string/strdup.c
@@ -5,7 +5,7 @@
 
 char *strdup(char *orig)
 {
-	u8 s_orig = strlen(orig);
+	u32 s_orig = strlen(orig);
 	char *ret = (char *)malloc(s_orig + 1);
 	strcpy(ret, orig);
 	return ret;
diff --git a/src/userspace/libc/string/strinv.c b/src/userspace/libc/string/strinv.c
index 38f0b78..261e57e 100644
--- a/src/userspace/libc/string/strinv.c
+++ b/src/userspace/libc/string/strinv.c
@@ -3,7 +3,7 @@
 
 void strinv(char *str)
 {
-	u8 s_str = strlen(str);
+	u32 s_str = strlen(str);
 
 	int iterations = (int)s_str / 2;
 	for (int i = 0; i < iterations; i++) {
diff --git a/src/userspace/libc/string/strlen.c b/src/userspace/libc/string/strlen.c
index cc8b804..cb04675 100644
--- a/src/userspace/libc/string/strlen.c
+++ b/src/userspace/libc/string/strlen.c
@@ -1,8 +1,8 @@
 #include <stdint.h>
 
-u8 strlen(char *str)
+u32 strlen(char *str)
 {
-	u8 len = 0;
+	u32 len = 0;
 	while (str[len])
 		len++;
 	return len;
diff --git a/src/userspace/programs/init.c b/src/userspace/programs/init.c
index af4f5f1..a669249 100644
--- a/src/userspace/programs/init.c
+++ b/src/userspace/programs/init.c
@@ -1,12 +1,18 @@
 #include <stdio.h>
+#include <stdlib.h>
 #include <syscall.h>
 #include <gui.h>
 
 void main()
 {
-	printf("Initializing userspace...\n");
+	u32 *buf = malloc(4096);
+	for (int i = 0; i < 4; i++)
+		buf[i] = 42;
+	syscall_halt();
+
+	//printf("Initializing userspace...\n");
 	//gui_init();
-	syscall_exec("/bin/sh");
+	//syscall_exec("/bin/sh");
 
 	while (1) {
 	};