From a48002996e216224b77ee0900319831ad7702c19 Mon Sep 17 00:00:00 2001 From: Abdelrahman Date: Sun, 6 Oct 2024 12:54:04 +0100 Subject: [PATCH] Reorganise src directory --- src/core/cpath/cpath.c | 7 +++++-- src/core/cpath/cpath.h | 6 ++---- src/{common/mem_utils => os/mem}/mem_utils.c | 0 src/{common/mem_utils => os/mem}/mem_utils.h | 0 src/{common/mem_utils => os/mem}/mem_utils_ops.h | 0 src/{common/mem_utils => os/mem}/posix/mem_utils_posix.c | 0 src/{common/mem_utils => os/mem}/posix/mem_utils_posix.h | 0 src/{common/mem_utils => os/mem}/win/mem_utils_win.c | 0 src/{common/mem_utils => os/mem}/win/mem_utils_win.h | 0 src/{common => os}/shell/commander/commander.c | 0 src/{common => os}/shell/commander/commander.h | 0 src/{common => os}/shell/commander/commander_output.h | 0 src/{common => os}/shell/commander/posix/commander_posix.c | 0 src/{common => os}/shell/commander/win/commander_win.c | 0 .../shell/termcolour/posix/termcolour_posix.c | 0 src/{common => os}/shell/termcolour/termcolour.c | 0 src/{common => os}/shell/termcolour/termcolour.h | 0 src/{common => os}/shell/termcolour/terminal_colours.h | 0 src/{common => os}/shell/termcolour/win/termcolour_win.c | 0 src/{common => os}/shell/utils/shell_utils.h | 0 20 files changed, 7 insertions(+), 6 deletions(-) rename src/{common/mem_utils => os/mem}/mem_utils.c (100%) rename src/{common/mem_utils => os/mem}/mem_utils.h (100%) rename src/{common/mem_utils => os/mem}/mem_utils_ops.h (100%) rename src/{common/mem_utils => os/mem}/posix/mem_utils_posix.c (100%) rename src/{common/mem_utils => os/mem}/posix/mem_utils_posix.h (100%) rename src/{common/mem_utils => os/mem}/win/mem_utils_win.c (100%) rename src/{common/mem_utils => os/mem}/win/mem_utils_win.h (100%) rename src/{common => os}/shell/commander/commander.c (100%) rename src/{common => os}/shell/commander/commander.h (100%) rename src/{common => os}/shell/commander/commander_output.h (100%) rename src/{common => os}/shell/commander/posix/commander_posix.c (100%) rename src/{common => os}/shell/commander/win/commander_win.c (100%) rename src/{common => os}/shell/termcolour/posix/termcolour_posix.c (100%) rename src/{common => os}/shell/termcolour/termcolour.c (100%) rename src/{common => os}/shell/termcolour/termcolour.h (100%) rename src/{common => os}/shell/termcolour/terminal_colours.h (100%) rename src/{common => os}/shell/termcolour/win/termcolour_win.c (100%) rename src/{common => os}/shell/utils/shell_utils.h (100%) diff --git a/src/core/cpath/cpath.c b/src/core/cpath/cpath.c index ab3130e..cf66c4f 100644 --- a/src/core/cpath/cpath.c +++ b/src/core/cpath/cpath.c @@ -1,13 +1,16 @@ #include "cpath.h" #include "aliases.h" +#include "platform.h" #include #include #include -#if defined(__unix__) || defined(__APPLE__) || defined(__ANDROID__) +#ifdef WAPP_PLATFORM_POSIX internal char path_sep = '/'; -#elif defined(_WIN32) || defined(_WIN64) +#elif defined(WAPP_PLATFORM_WINDOWS) internal char path_sep = '\\'; +#else +#error "Unrecognised platform" #endif void join_root_and_leaf(const char *root, const char *leaf, char *dst); diff --git a/src/core/cpath/cpath.h b/src/core/cpath/cpath.h index adbff6a..ed16c90 100644 --- a/src/core/cpath/cpath.h +++ b/src/core/cpath/cpath.h @@ -7,11 +7,9 @@ BEGIN_C_LINKAGE #endif // __cplusplus -#define NUMPARTS(...) \ - (sizeof((const char *[]){"", __VA_ARGS__}) / sizeof(const char *) - 1) +#define NUMPARTS(...) (sizeof((const char *[]){"", __VA_ARGS__}) / sizeof(const char *) - 1) -#define wapp_cpath_join_path(DST, ...) \ - join_path(DST, NUMPARTS(__VA_ARGS__), __VA_ARGS__) +#define wapp_cpath_join_path(DST, ...) join_path(DST, NUMPARTS(__VA_ARGS__), __VA_ARGS__) #define wapp_cpath_dirname(DST, PATH) dirup(DST, 1, PATH) #define wapp_cpath_dirup(DST, COUNT, PATH) dirup(DST, COUNT, PATH) diff --git a/src/common/mem_utils/mem_utils.c b/src/os/mem/mem_utils.c similarity index 100% rename from src/common/mem_utils/mem_utils.c rename to src/os/mem/mem_utils.c diff --git a/src/common/mem_utils/mem_utils.h b/src/os/mem/mem_utils.h similarity index 100% rename from src/common/mem_utils/mem_utils.h rename to src/os/mem/mem_utils.h diff --git a/src/common/mem_utils/mem_utils_ops.h b/src/os/mem/mem_utils_ops.h similarity index 100% rename from src/common/mem_utils/mem_utils_ops.h rename to src/os/mem/mem_utils_ops.h diff --git a/src/common/mem_utils/posix/mem_utils_posix.c b/src/os/mem/posix/mem_utils_posix.c similarity index 100% rename from src/common/mem_utils/posix/mem_utils_posix.c rename to src/os/mem/posix/mem_utils_posix.c diff --git a/src/common/mem_utils/posix/mem_utils_posix.h b/src/os/mem/posix/mem_utils_posix.h similarity index 100% rename from src/common/mem_utils/posix/mem_utils_posix.h rename to src/os/mem/posix/mem_utils_posix.h diff --git a/src/common/mem_utils/win/mem_utils_win.c b/src/os/mem/win/mem_utils_win.c similarity index 100% rename from src/common/mem_utils/win/mem_utils_win.c rename to src/os/mem/win/mem_utils_win.c diff --git a/src/common/mem_utils/win/mem_utils_win.h b/src/os/mem/win/mem_utils_win.h similarity index 100% rename from src/common/mem_utils/win/mem_utils_win.h rename to src/os/mem/win/mem_utils_win.h diff --git a/src/common/shell/commander/commander.c b/src/os/shell/commander/commander.c similarity index 100% rename from src/common/shell/commander/commander.c rename to src/os/shell/commander/commander.c diff --git a/src/common/shell/commander/commander.h b/src/os/shell/commander/commander.h similarity index 100% rename from src/common/shell/commander/commander.h rename to src/os/shell/commander/commander.h diff --git a/src/common/shell/commander/commander_output.h b/src/os/shell/commander/commander_output.h similarity index 100% rename from src/common/shell/commander/commander_output.h rename to src/os/shell/commander/commander_output.h diff --git a/src/common/shell/commander/posix/commander_posix.c b/src/os/shell/commander/posix/commander_posix.c similarity index 100% rename from src/common/shell/commander/posix/commander_posix.c rename to src/os/shell/commander/posix/commander_posix.c diff --git a/src/common/shell/commander/win/commander_win.c b/src/os/shell/commander/win/commander_win.c similarity index 100% rename from src/common/shell/commander/win/commander_win.c rename to src/os/shell/commander/win/commander_win.c diff --git a/src/common/shell/termcolour/posix/termcolour_posix.c b/src/os/shell/termcolour/posix/termcolour_posix.c similarity index 100% rename from src/common/shell/termcolour/posix/termcolour_posix.c rename to src/os/shell/termcolour/posix/termcolour_posix.c diff --git a/src/common/shell/termcolour/termcolour.c b/src/os/shell/termcolour/termcolour.c similarity index 100% rename from src/common/shell/termcolour/termcolour.c rename to src/os/shell/termcolour/termcolour.c diff --git a/src/common/shell/termcolour/termcolour.h b/src/os/shell/termcolour/termcolour.h similarity index 100% rename from src/common/shell/termcolour/termcolour.h rename to src/os/shell/termcolour/termcolour.h diff --git a/src/common/shell/termcolour/terminal_colours.h b/src/os/shell/termcolour/terminal_colours.h similarity index 100% rename from src/common/shell/termcolour/terminal_colours.h rename to src/os/shell/termcolour/terminal_colours.h diff --git a/src/common/shell/termcolour/win/termcolour_win.c b/src/os/shell/termcolour/win/termcolour_win.c similarity index 100% rename from src/common/shell/termcolour/win/termcolour_win.c rename to src/os/shell/termcolour/win/termcolour_win.c diff --git a/src/common/shell/utils/shell_utils.h b/src/os/shell/utils/shell_utils.h similarity index 100% rename from src/common/shell/utils/shell_utils.h rename to src/os/shell/utils/shell_utils.h