summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/user/app/ext2fs/main.c4
-rw-r--r--src/user/app/init/driver/initctl.c2
-rw-r--r--src/user/app/init/driver/ps2.c2
-rw-r--r--src/user/app/init/init.c2
-rw-r--r--src/user/app/logfs/logfs.c2
-rw-r--r--src/user/app/login/login.c2
-rw-r--r--src/user/app/shell/builtins.c2
-rw-r--r--src/user/app/shell/shell.c2
-rw-r--r--src/user/app/tests/kernel/path.c4
-rw-r--r--src/user/app/tmpfs/tmpfs.c6
-rw-r--r--src/user/app/vterm/vterm.c2
-rw-r--r--src/user/bootstrap/main.c4
-rw-r--r--src/user/bootstrap/tar.c5
-rw-r--r--src/user/lib/compat.c2
-rw-r--r--src/user/lib/fs/dir.c2
-rw-r--r--src/user/lib/fs/misc.c7
-rw-r--r--src/user/lib/fs/whitelist.c4
-rw-r--r--src/user/lib/include/camellia/compat.h (renamed from src/user/lib/compat.h)0
-rw-r--r--src/user/lib/include/camellia/fs/dir.h (renamed from src/user/lib/fs/dir.h)0
-rw-r--r--src/user/lib/include/camellia/fs/misc.h (renamed from src/user/lib/fs/misc.h)0
20 files changed, 26 insertions, 28 deletions
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};
diff --git a/src/user/bootstrap/main.c b/src/user/bootstrap/main.c
index a0885dd..97b980b 100644
--- a/src/user/bootstrap/main.c
+++ b/src/user/bootstrap/main.c
@@ -1,9 +1,9 @@
#include <camellia/flags.h>
#include <camellia/syscalls.h>
-#include <shared/mem.h>
#include <stdio.h>
+#include <string.h>
#include <user/lib/elfload.h>
-#include <user/lib/fs/misc.h>
+#include <camellia/fs/misc.h>
#include "tar.h"
diff --git a/src/user/bootstrap/tar.c b/src/user/bootstrap/tar.c
index 2968995..2020fe0 100644
--- a/src/user/bootstrap/tar.c
+++ b/src/user/bootstrap/tar.c
@@ -2,12 +2,11 @@
#include <camellia/flags.h>
#include <camellia/fsutil.h>
#include <camellia/syscalls.h>
-#include <shared/mem.h>
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
-#include <user/lib/compat.h>
-#include <user/lib/fs/dir.h>
+#include <camellia/compat.h>
+#include <camellia/fs/dir.h>
#define BUF_SIZE 64
diff --git a/src/user/lib/compat.c b/src/user/lib/compat.c
index 63ae717..4634f57 100644
--- a/src/user/lib/compat.c
+++ b/src/user/lib/compat.c
@@ -1,6 +1,6 @@
#include <camellia/syscalls.h>
#include <stdio.h>
-#include <user/lib/compat.h>
+#include <camellia/compat.h>
#define eprintf(fmt, ...) fprintf(stderr, "user/lib/compat: "fmt"\n" __VA_OPT__(,) __VA_ARGS__)
diff --git a/src/user/lib/fs/dir.c b/src/user/lib/fs/dir.c
index 4235ea6..71b2209 100644
--- a/src/user/lib/fs/dir.c
+++ b/src/user/lib/fs/dir.c
@@ -2,7 +2,7 @@
#include <errno.h>
#include <limits.h>
#include <string.h>
-#include <user/lib/fs/dir.h>
+#include <camellia/fs/dir.h>
void dir_start(struct dirbuild *db, long offset, char *buf, size_t buflen) {
db->offset = offset;
diff --git a/src/user/lib/fs/misc.c b/src/user/lib/fs/misc.c
index 860b312..11428b8 100644
--- a/src/user/lib/fs/misc.c
+++ b/src/user/lib/fs/misc.c
@@ -1,15 +1,14 @@
#include <camellia/flags.h>
#include <camellia/syscalls.h>
#include <errno.h>
-#include <shared/mem.h>
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include <user/lib/compat.h>
-#include <user/lib/fs/dir.h>
-#include <user/lib/fs/misc.h>
+#include <camellia/compat.h>
+#include <camellia/fs/dir.h>
+#include <camellia/fs/misc.h>
bool fork2_n_mount(const char *path) {
handle_t h;
diff --git a/src/user/lib/fs/whitelist.c b/src/user/lib/fs/whitelist.c
index 571ebfb..5612d9a 100644
--- a/src/user/lib/fs/whitelist.c
+++ b/src/user/lib/fs/whitelist.c
@@ -3,8 +3,8 @@
#include <errno.h>
#include <stdlib.h>
#include <string.h>
-#include <user/lib/fs/dir.h>
-#include <user/lib/fs/misc.h>
+#include <camellia/fs/dir.h>
+#include <camellia/fs/misc.h>
static int dir_seglen2(const char *path, size_t len) {
/* returns the length of the first segment of the path, including the trailing / (if any). */
diff --git a/src/user/lib/compat.h b/src/user/lib/include/camellia/compat.h
index a7c6f1f..a7c6f1f 100644
--- a/src/user/lib/compat.h
+++ b/src/user/lib/include/camellia/compat.h
diff --git a/src/user/lib/fs/dir.h b/src/user/lib/include/camellia/fs/dir.h
index c3bbfe7..c3bbfe7 100644
--- a/src/user/lib/fs/dir.h
+++ b/src/user/lib/include/camellia/fs/dir.h
diff --git a/src/user/lib/fs/misc.h b/src/user/lib/include/camellia/fs/misc.h
index 35184e1..35184e1 100644
--- a/src/user/lib/fs/misc.h
+++ b/src/user/lib/include/camellia/fs/misc.h
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-22 20:38:01 +0000