From f01eed8dd2d18ef7b602ea3c65c0a2e15543bac4 Mon Sep 17 00:00:00 2001
From: Alex <enderice2@users.noreply.github.com>
Date: Wed, 3 May 2023 06:40:12 +0300
Subject: [PATCH] Update libs header path

---
 libc/ElfInterpreter/ld.c                  | 2 +-
 libs/Makefile                             | 2 +-
 libs/include/{ => libinit}/init.h         | 3 ++-
 libs/include/{sysbase.h => libsys/base.h} | 0
 libs/include/{sysfile.h => libsys/file.h} | 0
 libs/include/{sysproc.h => libsys/proc.h} | 0
 libs/libinit/libinit.c                    | 2 +-
 libs/libsys/Base.c                        | 2 +-
 libs/libsys/File.c                        | 4 ++--
 libs/libsys/Process.c                     | 4 ++--
 10 files changed, 10 insertions(+), 9 deletions(-)
 rename libs/include/{ => libinit}/init.h (94%)
 rename libs/include/{sysbase.h => libsys/base.h} (100%)
 rename libs/include/{sysfile.h => libsys/file.h} (100%)
 rename libs/include/{sysproc.h => libsys/proc.h} (100%)

diff --git a/libc/ElfInterpreter/ld.c b/libc/ElfInterpreter/ld.c
index e13966b..1c2def9 100644
--- a/libc/ElfInterpreter/ld.c
+++ b/libc/ElfInterpreter/ld.c
@@ -1,6 +1,6 @@
 #include "ld.h"
 
-#include "../../libs/include/sysbase.h"
+#include "../../libs/include/libsys/base.h"
 #include "../../../Kernel/syscalls.h"
 #include "../../../Kernel/ipc.h"
 #include "elf.h"
diff --git a/libs/Makefile b/libs/Makefile
index c6fbc30..286ae5c 100644
--- a/libs/Makefile
+++ b/libs/Makefile
@@ -1,5 +1,5 @@
 build:
-	cp include/* ../out/system/include
+	cp -r include/* ../out/system/include
 	make -C libgcc build
 	make -C libinit build
 	make -C libssp build
diff --git a/libs/include/init.h b/libs/include/libinit/init.h
similarity index 94%
rename from libs/include/init.h
rename to libs/include/libinit/init.h
index ab7472d..da37d1e 100644
--- a/libs/include/init.h
+++ b/libs/include/libinit/init.h
@@ -1,7 +1,8 @@
 #ifndef __FENNIX_LIBS_INIT_H__
 #define __FENNIX_LIBS_INIT_H__
 
-#include <types.h>
+#include <stddef.h>
+#include <stdarg.h>
 
 __attribute__((visibility("hidden"))) int printf_libinit(const char *format, ...);
 __attribute__((visibility("hidden"))) int vprintf_libinit(const char *format, va_list arg);
diff --git a/libs/include/sysbase.h b/libs/include/libsys/base.h
similarity index 100%
rename from libs/include/sysbase.h
rename to libs/include/libsys/base.h
diff --git a/libs/include/sysfile.h b/libs/include/libsys/file.h
similarity index 100%
rename from libs/include/sysfile.h
rename to libs/include/libsys/file.h
diff --git a/libs/include/sysproc.h b/libs/include/libsys/proc.h
similarity index 100%
rename from libs/include/sysproc.h
rename to libs/include/libsys/proc.h
diff --git a/libs/libinit/libinit.c b/libs/libinit/libinit.c
index 74949f5..d31c8ff 100644
--- a/libs/libinit/libinit.c
+++ b/libs/libinit/libinit.c
@@ -1,4 +1,4 @@
-#include <init.h>
+#include <libinit/init.h>
 
 #include "printf.h"
 
diff --git a/libs/libsys/Base.c b/libs/libsys/Base.c
index fcfd9c1..5fb72be 100644
--- a/libs/libsys/Base.c
+++ b/libs/libsys/Base.c
@@ -1,4 +1,4 @@
-#include <sysbase.h>
+#include <libsys/base.h>
 
 #include "../../../Kernel/syscalls.h"
 
diff --git a/libs/libsys/File.c b/libs/libsys/File.c
index 9f9b7bb..257f7ba 100644
--- a/libs/libsys/File.c
+++ b/libs/libsys/File.c
@@ -1,5 +1,5 @@
-#include <sysbase.h>
-#include <sysfile.h>
+#include <libsys/base.h>
+#include <libsys/file.h>
 
 #include "../../../Kernel/syscalls.h"
 
diff --git a/libs/libsys/Process.c b/libs/libsys/Process.c
index dcacdcc..b812431 100644
--- a/libs/libsys/Process.c
+++ b/libs/libsys/Process.c
@@ -1,5 +1,5 @@
-#include <sysbase.h>
-#include <sysproc.h>
+#include <libsys/base.h>
+#include <libsys/proc.h>
 
 #include "../../../Kernel/syscalls.h"