From f6bc1ccf2462642383d1644321a101e62105c2a7 Mon Sep 17 00:00:00 2001
From: dzwdz
Date: Sun, 25 Dec 2022 21:47:23 +0100
Subject: user/lib: reorganize a few header files

---
 src/user/app/ext2fs/main.c         | 4 ++--
 src/user/app/init/driver/initctl.c | 2 +-
 src/user/app/init/driver/ps2.c     | 2 +-
 src/user/app/init/init.c           | 2 +-
 src/user/app/logfs/logfs.c         | 2 +-
 src/user/app/login/login.c         | 2 +-
 src/user/app/shell/builtins.c      | 2 +-
 src/user/app/shell/shell.c         | 2 +-
 src/user/app/tests/kernel/path.c   | 4 ++--
 src/user/app/tmpfs/tmpfs.c         | 6 +++---
 src/user/app/vterm/vterm.c         | 2 +-
 11 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'src/user/app')

diff --git a/src/user/app/ext2fs/main.c b/src/user/app/ext2fs/main.c
index 24d1ab0..4fda57c 100644
--- a/src/user/app/ext2fs/main.c
+++ b/src/user/app/ext2fs/main.c
@@ -1,6 +1,8 @@
 #include "ext2/ex_cache.h"
 #include "ext2/ext2.h"
 #include <camellia/flags.h>
+#include <camellia/fs/dir.h>
+#include <camellia/fs/misc.h>
 #include <camellia/syscalls.h>
 #include <err.h>
 #include <errno.h>
@@ -8,8 +10,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <user/lib/fs/dir.h>
-#include <user/lib/fs/misc.h>
 
 struct handle {
 	uint32_t n;
diff --git a/src/user/app/init/driver/initctl.c b/src/user/app/init/driver/initctl.c
index b9fe1c9..76d1b1b 100644
--- a/src/user/app/init/driver/initctl.c
+++ b/src/user/app/init/driver/initctl.c
@@ -4,7 +4,7 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
-#include <user/lib/compat.h>
+#include <camellia/compat.h>
 
 void initctl_drv(handle_t killswitch) {
 	struct ufs_request res;
diff --git a/src/user/app/init/driver/ps2.c b/src/user/app/init/driver/ps2.c
index 5e9aeac..1accbfc 100644
--- a/src/user/app/init/driver/ps2.c
+++ b/src/user/app/init/driver/ps2.c
@@ -3,7 +3,7 @@
 #include <shared/container/ring.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <user/lib/compat.h>
+#include <camellia/compat.h>
 
 
 static const char keymap_lower[] = {
diff --git a/src/user/app/init/init.c b/src/user/app/init/init.c
index f89e407..10511b8 100644
--- a/src/user/app/init/init.c
+++ b/src/user/app/init/init.c
@@ -4,7 +4,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <unistd.h>
-#include <user/lib/fs/misc.h>
+#include <camellia/fs/misc.h>
 
 #define die(fmt, ...) do { fprintf(stderr, "init: " fmt, __VA_ARGS__); exit(1); } while (0)
 
diff --git a/src/user/app/logfs/logfs.c b/src/user/app/logfs/logfs.c
index ba25564..14a8f2a 100644
--- a/src/user/app/logfs/logfs.c
+++ b/src/user/app/logfs/logfs.c
@@ -3,7 +3,7 @@
 #include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <user/lib/fs/misc.h>
+#include <camellia/fs/misc.h>
 
 _Noreturn void fs(void) {
 	const size_t buflen = 1024;
diff --git a/src/user/app/login/login.c b/src/user/app/login/login.c
index af6e19c..a348254 100644
--- a/src/user/app/login/login.c
+++ b/src/user/app/login/login.c
@@ -7,7 +7,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#include <user/lib/fs/misc.h>
+#include <camellia/fs/misc.h>
 
 static const char *shell = "/bin/shell";
 
diff --git a/src/user/app/shell/builtins.c b/src/user/app/shell/builtins.c
index 6368633..4ea6c9a 100644
--- a/src/user/app/shell/builtins.c
+++ b/src/user/app/shell/builtins.c
@@ -8,7 +8,7 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <user/lib/fs/misc.h>
+#include <camellia/fs/misc.h>
 
 #define DEFAULT_ARGV(...) \
 	char *_argv_default[] = {argv[0], __VA_ARGS__}; \
diff --git a/src/user/app/shell/shell.c b/src/user/app/shell/shell.c
index 290102e..365e087 100644
--- a/src/user/app/shell/shell.c
+++ b/src/user/app/shell/shell.c
@@ -8,7 +8,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <user/lib/fs/misc.h>
+#include <camellia/fs/misc.h>
 #include <x86intrin.h>
 
 int main();
diff --git a/src/user/app/tests/kernel/path.c b/src/user/app/tests/kernel/path.c
index fd6eeec..2bce344 100644
--- a/src/user/app/tests/kernel/path.c
+++ b/src/user/app/tests/kernel/path.c
@@ -1,8 +1,8 @@
 #include "../tests.h"
 #include <camellia/path.h>
 #include <string.h>
-#include <user/lib/compat.h>
-#include <user/lib/fs/misc.h>
+#include <camellia/compat.h>
+#include <camellia/fs/misc.h>
 
 static void test_path_simplify(void) {
 	const char *testcases[][2] = {
diff --git a/src/user/app/tmpfs/tmpfs.c b/src/user/app/tmpfs/tmpfs.c
index 7614d92..3b4d7d5 100644
--- a/src/user/app/tmpfs/tmpfs.c
+++ b/src/user/app/tmpfs/tmpfs.c
@@ -1,14 +1,14 @@
+#include <camellia/compat.h>
 #include <camellia/flags.h>
+#include <camellia/fs/dir.h>
 #include <camellia/fsutil.h>
 #include <camellia/syscalls.h>
 #include <errno.h>
-#include <shared/mem.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
-#include <user/lib/compat.h>
-#include <user/lib/fs/dir.h>
 
 struct node {
 	const char *name;
diff --git a/src/user/app/vterm/vterm.c b/src/user/app/vterm/vterm.c
index bb60a34..76f6a17 100644
--- a/src/user/app/vterm/vterm.c
+++ b/src/user/app/vterm/vterm.c
@@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <user/lib/compat.h>
+#include <camellia/compat.h>
 
 struct point cursor = {0};
 
-- 
cgit v1.2.3