diff options
Diffstat (limited to 'src/user/lib')
-rw-r--r-- | src/user/lib/compat.c | 2 | ||||
-rw-r--r-- | src/user/lib/fs/dir.c | 2 | ||||
-rw-r--r-- | src/user/lib/fs/misc.c | 7 | ||||
-rw-r--r-- | src/user/lib/fs/whitelist.c | 4 | ||||
-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 |
7 files changed, 7 insertions, 8 deletions
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 |