From a3e27d361919392eeb0086ed93b105d8301c7913 Mon Sep 17 00:00:00 2001 From: dzwdz Date: Tue, 26 Jul 2022 19:31:06 +0200 Subject: user: move the POSIX-y stuff to the proper header files --- src/user/app/init/driver/ansiterm.c | 2 +- src/user/app/init/driver/ps2.c | 2 +- src/user/app/init/driver/termcook.c | 5 +++-- src/user/app/init/driver/tmpfs.c | 2 +- src/user/app/init/main.c | 9 +++------ src/user/app/init/shell.c | 8 +++++--- src/user/app/init/tests/main.c | 6 ++++-- src/user/app/init/tests/main.h | 18 ------------------ src/user/app/init/tests/pipe.c | 5 +++-- src/user/app/init/tests/semaphore.c | 6 ++++-- src/user/app/init/tests/stress.c | 4 ++-- src/user/app/init/tests/tests.h | 20 ++++++++++++++++++++ src/user/app/testelf/main.c | 3 +-- 13 files changed, 48 insertions(+), 42 deletions(-) delete mode 100644 src/user/app/init/tests/main.h create mode 100644 src/user/app/init/tests/tests.h (limited to 'src/user/app') diff --git a/src/user/app/init/driver/ansiterm.c b/src/user/app/init/driver/ansiterm.c index dde2183..4b66d6f 100644 --- a/src/user/app/init/driver/ansiterm.c +++ b/src/user/app/init/driver/ansiterm.c @@ -1,6 +1,6 @@ +#include "driver.h" #include #include -#include struct vga_cell { unsigned char c; diff --git a/src/user/app/init/driver/ps2.c b/src/user/app/init/driver/ps2.c index 45458c8..6aed2fb 100644 --- a/src/user/app/init/driver/ps2.c +++ b/src/user/app/init/driver/ps2.c @@ -1,7 +1,7 @@ +#include "driver.h" #include #include #include -#include static const char keymap_lower[] = { diff --git a/src/user/app/init/driver/termcook.c b/src/user/app/init/driver/termcook.c index 868d5d3..59cef77 100644 --- a/src/user/app/init/driver/termcook.c +++ b/src/user/app/init/driver/termcook.c @@ -1,6 +1,7 @@ +#include "driver.h" #include -#include -#include +#include +#include static void w_output(handle_t output, const char *buf, size_t len) { size_t pos = 0; diff --git a/src/user/app/init/driver/tmpfs.c b/src/user/app/init/driver/tmpfs.c index 200e62d..83c42c7 100644 --- a/src/user/app/init/driver/tmpfs.c +++ b/src/user/app/init/driver/tmpfs.c @@ -1,7 +1,7 @@ #include #include #include -#include +#include struct node { const char *name; diff --git a/src/user/app/init/main.c b/src/user/app/init/main.c index 772a9e3..9c664a0 100644 --- a/src/user/app/init/main.c +++ b/src/user/app/init/main.c @@ -1,18 +1,15 @@ +#include "driver/driver.h" #include #include #include -#include -#include -#include +#include +#include #include #include -#include __attribute__((visibility("hidden"))) extern char _image_base[]; -void read_file(const char *path, size_t len); - __attribute__((section(".text.startup"))) int main(void) { elf_selfreloc(); diff --git a/src/user/app/init/shell.c b/src/user/app/init/shell.c index 76a0dbc..0c8b9b4 100644 --- a/src/user/app/init/shell.c +++ b/src/user/app/init/shell.c @@ -1,9 +1,11 @@ +#include "shell.h" +#include "tests/tests.h" #include #include -#include -#include +#include +#include +#include #include -#include static bool isspace(char c) { return c == ' ' || c == '\t' || c == '\n'; diff --git a/src/user/app/init/tests/main.c b/src/user/app/init/tests/main.c index 4f8e858..cf59925 100644 --- a/src/user/app/init/tests/main.c +++ b/src/user/app/init/tests/main.c @@ -1,10 +1,12 @@ #define TEST_MACROS +#include "tests.h" #include #include #include #include -#include -#include +#include +#include +#include static void run_forked(void (*fn)()) { if (!fork()) { diff --git a/src/user/app/init/tests/main.h b/src/user/app/init/tests/main.h deleted file mode 100644 index ed11c5e..0000000 --- a/src/user/app/init/tests/main.h +++ /dev/null @@ -1,18 +0,0 @@ -#pragma once - -void stress_all(void); -void test_all(void); - -void test_pipe(void); -void test_semaphore(void); - -#ifdef TEST_MACROS - -#define argify(str) str, sizeof(str) - 1 -#define test_fail() do { \ - printf("\033[31m" "TEST FAILED: %s:%xh\n" "\033[0m", __func__, __LINE__); \ - _syscall_exit(0); \ -} while (0) -#define assert(cond) if (!(cond)) test_fail(); - -#endif diff --git a/src/user/app/init/tests/pipe.c b/src/user/app/init/tests/pipe.c index 227007a..f7005f8 100644 --- a/src/user/app/init/tests/pipe.c +++ b/src/user/app/init/tests/pipe.c @@ -1,8 +1,9 @@ #define TEST_MACROS +#include "tests.h" #include #include -#include -#include +#include +#include static const char *pipe_msgs[2] = {"hello", "world"}; diff --git a/src/user/app/init/tests/semaphore.c b/src/user/app/init/tests/semaphore.c index b55db9e..fc0cc10 100644 --- a/src/user/app/init/tests/semaphore.c +++ b/src/user/app/init/tests/semaphore.c @@ -1,9 +1,11 @@ #define TEST_MACROS +#include "tests.h" #include #include -#include +#include +#include +#include #include -#include static void odd(handle_t out, struct evil_sem *sem1, struct evil_sem *sem2) { _syscall_write(out, "1", 1, -1); diff --git a/src/user/app/init/tests/stress.c b/src/user/app/init/tests/stress.c index f797611..e620f0a 100644 --- a/src/user/app/init/tests/stress.c +++ b/src/user/app/init/tests/stress.c @@ -1,8 +1,8 @@ #define TEST_MACROS +#include "tests.h" #include #include -#include -#include +#include static void run_forked(void (*fn)()) { if (!fork()) { diff --git a/src/user/app/init/tests/tests.h b/src/user/app/init/tests/tests.h new file mode 100644 index 0000000..23ed1e3 --- /dev/null +++ b/src/user/app/init/tests/tests.h @@ -0,0 +1,20 @@ +#pragma once +#include +#include + +void stress_all(void); +void test_all(void); + +void test_pipe(void); +void test_semaphore(void); + +#ifdef TEST_MACROS + +#define argify(str) str, sizeof(str) - 1 +#define test_fail() do { \ + printf("\033[31m" "TEST FAILED: %s:%xh\n" "\033[0m", __func__, __LINE__); \ + _syscall_exit(0); \ +} while (0) +#define assert(cond) if (!(cond)) test_fail(); + +#endif diff --git a/src/user/app/testelf/main.c b/src/user/app/testelf/main.c index 8c5b6a4..de7b965 100644 --- a/src/user/app/testelf/main.c +++ b/src/user/app/testelf/main.c @@ -1,8 +1,7 @@ #include -#include +#include #include #include -#include const char *str = "Hello!\n", *str2 = "World.\n"; -- cgit v1.2.3