hamcorebuilder: Use libhamcore to build archive

https://github.com/SoftEtherVPN/libhamcore

Author: davidebeatrici

.gitmodules

@@ -7,3 +7,6 @@
 [submodule "3rdparty/BLAKE2"]
 	path = 3rdparty/BLAKE2
 	url = https://github.com/BLAKE2/BLAKE2.git
+[submodule "src/libhamcore"]
+	path = src/libhamcore
+	url = https://github.com/SoftEtherVPN/libhamcore.git

CMakeLists.txt

@@ -25,7 +25,7 @@ else()
 endif()
 
 # Check that submodules are present only if source was downloaded with git
-if(EXISTS "${TOP_DIRECTORY}/.git" AND NOT EXISTS "${TOP_DIRECTORY}/src/Mayaqua/3rdparty/cpu_features/CMakeLists.txt")
+if(EXISTS "${TOP_DIRECTORY}/.git" AND NOT EXISTS "${TOP_DIRECTORY}/src/libhamcore/CMakeLists.txt")
     message (FATAL_ERROR "Submodules are not initialized. Run\n\tgit submodule update --init --recursive")
 endif()
 

src/CMakeLists.txt

@@ -123,9 +123,6 @@ add_subdirectory(Cedar)
 # Mayaqua kernel
 add_subdirectory(Mayaqua)
 
-# hamcorebuilder utility
-add_subdirectory(hamcorebuilder)
-
 # vpnserver
 add_subdirectory(vpnserver)
 
@@ -141,6 +138,12 @@ add_subdirectory(vpncmd)
 # vpntest
 add_subdirectory(vpntest)
 
+# libhamcore
+add_subdirectory(libhamcore)
+
+# hamcorebuilder utility
+add_subdirectory(hamcorebuilder)
+
 # hamcore.se2 archive file
 add_custom_target(hamcore-archive-build
   ALL

src/hamcorebuilder/CMakeLists.txt

@@ -1,5 +1,3 @@
-include(TestBigEndian)
-
 add_executable(hamcorebuilder
   main.c
   FileSystem.c
@@ -10,12 +8,6 @@ if(WIN32)
   target_compile_definitions(hamcorebuilder PRIVATE "OS_WINDOWS")
 endif()
 
-test_big_endian(BIG_ENDIAN)
-if(BIG_ENDIAN)
-  target_compile_definitions(hamcorebuilder PRIVATE "BYTE_ORDER_BIG_ENDIAN")
-endif()
-
 target_include_directories(hamcorebuilder PRIVATE "${TOP_DIRECTORY}/3rdparty/tinydir")
 
-find_package(ZLIB REQUIRED)
-target_link_libraries(hamcorebuilder PRIVATE ZLIB::ZLIB)
+target_link_libraries(hamcorebuilder PRIVATE libhamcore)

src/hamcorebuilder/FileSystem.c

@@ -1,8 +1,6 @@
 #include "FileSystem.h"
 
-#include <string.h>
-
-#include <sys/stat.h>
+#include <stdio.h>
 
 ENTRIES *EnumEntries(const char *path)
 {
@@ -121,83 +119,6 @@ void FreeEntries(ENTRIES *entries)
 	free(entries);
 }
 
-FILE *FileOpen(const char *path, const bool write)
-{
-	if (!path)
-	{
-		return NULL;
-	}
-
-	return fopen(path, write ? "wb" : "rb");
-}
-
-bool FileClose(FILE *file)
-{
-	if (!file)
-	{
-		return false;
-	}
-
-	return fclose(file) == 0;
-}
-
-bool FileRead(FILE *file, void *dst, const size_t size)
-{
-	if (!file || !dst || size == 0)
-	{
-		return false;
-	}
-
-	return fread(dst, 1, size, file) == size;
-}
-
-bool FileWrite(FILE *file, const void *src, const size_t size)
-{
-	if (!file || !src || size == 0)
-	{
-		return false;
-	}
-
-	return fwrite(src, 1, size, file) == size;
-}
-
-size_t FileSize(const char *path)
-{
-	if (!path)
-	{
-		return 0;
-	}
-
-	struct stat st;
-	if (stat(path, &st) == -1)
-	{
-		return 0;
-	}
-
-	return st.st_size;
-}
-
-char *PathRelativeToBase(char *full, const char *base)
-{
-	if (!full || !base)
-	{
-		return NULL;
-	}
-
-	if (strstr(full, base) != &full[0])
-	{
-		return NULL;
-	}
-
-	full += strlen(base);
-	if (full[0] == '/')
-	{
-		++full;
-	}
-
-	return full;
-}
-
 #ifndef OS_WINDOWS
 bool IsWindowsExtension(const char *extension)
 {

src/hamcorebuilder/FileSystem.h

@@ -2,7 +2,6 @@
 #define FILESYSTEM_H
 
 #include <stdbool.h>
-#include <stdio.h>
 
 #include <tinydir.h>
 
@@ -24,14 +23,6 @@ ENTRIES *EnumEntries(const char *path);
 ENTRIES *EnumEntriesRecursively(const char *path, const bool files_only);
 void FreeEntries(ENTRIES *entries);
 
-FILE *FileOpen(const char *path, const bool write);
-bool FileClose(FILE *file);
-bool FileRead(FILE *file, void *dst, const size_t size);
-bool FileWrite(FILE *file, const void *src, const size_t size);
-size_t FileSize(const char *path);
-
-char *PathRelativeToBase(char *full, const char *base);
-
 #ifndef OS_WINDOWS
 bool IsWindowsExtension(const char *extension);
 #endif