CMake init; [*.c] C89 support; [*.c] Use (more) correct types

.gitignore

@@ -0,0 +1,3 @@
+*build*
+*_export.h
+.idea

CMakeLists.txt

@@ -0,0 +1,98 @@
+cmake_minimum_required(VERSION 3.0)
+project(stdarc_c VERSION 0.0.1 LANGUAGES C)
+
+set(CMAKE_C_STANDARD 90)
+cmake_policy(SET CMP0063 NEW)
+set(CMAKE_C_VISIBILITY_PRESET hidden)
+set(CMAKE_VISIBILITY_INLINES_HIDDEN YES)
+
+option(BUILD_SHARED_LIBS "Build using shared libraries" OFF)
+if (BUILD_SHARED_LIBS)
+    set(LIBRARY_TYPE_FLAG "SHARED")
+else ()
+    set(LIBRARY_TYPE_FLAG "STATIC")
+endif ()
+
+# control where the static and shared libraries are built so that on windows
+# we don't need to tinker with the path to run the executable
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}")
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}")
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}")
+
+add_library("${PROJECT_NAME}_compiler_flags" INTERFACE)
+target_compile_features("${PROJECT_NAME}_compiler_flags" INTERFACE "c_std_${CMAKE_C_STANDARD}")
+
+set(gcc_like "$<COMPILE_LANG_AND_ID:C,CXX,ARMClang,AppleClang,Clang,GNU>")
+set(msvc "$<COMPILE_LANG_AND_ID:C,CXX,MSVC>")
+# -g -fsanitize=address -fno-omit-frame-pointer
+target_compile_options(
+        "${PROJECT_NAME}_compiler_flags"
+        INTERFACE
+        "$<${gcc_like}:$<BUILD_INTERFACE:-Wall;-Wextra;-Wshadow;-Wformat=2;-Wunused;-pedantic->>"
+        "$<${msvc}:$<BUILD_INTERFACE:-W3;-WX;-Zi;-permissive->>"
+)
+if (CMAKE_C_COMPILER_ID STREQUAL "Clang" OR CMAKE_C_COMPILER_ID STREQUAL "AppleClang")
+    set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
+    set(CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
+endif()
+
+# configure a header file to pass the version number only
+configure_file(
+        "${CMAKE_CURRENT_SOURCE_DIR}/cmake/config.h.in"
+        "${PROJECT_NAME}Config.h"
+)
+
+add_subdirectory("src")
+
+option(BUILD_DEMOS "Build demos" ON)
+if (BUILD_DEMOS)
+    add_subdirectory("demo")
+endif (BUILD_DEMOS)
+
+install(
+        FILES "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.h"
+        DESTINATION "include"
+)
+
+include(InstallRequiredSystemLibraries)
+set(CPACK_BUNDLE_NAME "${PROJECT_NAME}")
+set(CPACK_PACKAGE_VENDOR "r-lyeh")
+set(CPACK_PACKAGE_DESCRIPTION "Small file archivers (zip, pak, tar), virtual filesystem (vfs) and dir listing in a single-file header.")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Collection of small public domain file archivers")
+if (APPLE)
+    set(CPACK_BUNDLE_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Info.plist")
+    set(CPACK_BUNDLE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Info.plist")
+    set(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/cmake/CustomVolumeIcon.icns")
+endif()
+set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
+set(CPACK_PACKAGE_VERSION_MAJOR "${${PROJECT_NAME}_VERSION_MAJOR}")
+set(CPACK_PACKAGE_VERSION_MINOR "${${PROJECT_NAME}_VERSION_MINOR}")
+set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/cmake/README.txt")
+set(CPACK_RESOURCE_FILE_WELCOME "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Welcome.txt")
+set(CPACK_PACKAGE_CONTACT "https://github.com/r-lyeh/stdarc.c")
+
+include(CPack)
+include(CMakePackageConfigHelpers)
+
+option(BUILD_SHARED_LIBS "Build using shared libraries" ON)
+if (BUILD_SHARED_LIBS)
+    set(LIBRARY_TYPE_FLAG "SHARED")
+else ()
+    set(LIBRARY_TYPE_FLAG "STATIC")
+endif ()
+
+# generate the config file that is includes the exports
+configure_package_config_file(
+        "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Config.cmake.in"
+        "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
+        INSTALL_DESTINATION "lib/cmake/example"
+        NO_SET_AND_CHECK_MACRO
+        NO_CHECK_REQUIRED_COMPONENTS_MACRO
+)
+
+# generate the version file for the config file
+write_basic_package_version_file(
+        "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
+        VERSION "${${PROJECT_NAME}_VERSION_MAJOR}.${${PROJECT_NAME}_VERSION_MINOR}"
+        COMPATIBILITY AnyNewerVersion
+)

cmake/CTestConfig.cmake

@@ -0,0 +1,7 @@
+set(CTEST_PROJECT_NAME "stdarc_c")
+set(CTEST_NIGHTLY_START_TIME "00:00:00 EST")
+
+set(CTEST_DROP_METHOD "http")
+set(CTEST_DROP_SITE "my.cdash.org")
+set(CTEST_DROP_LOCATION "/submit.php?project=stdarc_c")
+set(CTEST_DROP_SITE_CDASH TRUE)

cmake/Config.cmake.in

@@ -0,0 +1,4 @@
+
+@PACKAGE_INIT@
+
+include ( "${CMAKE_CURRENT_LIST_DIR}/libstdarc_cTargets.cmake" )

cmake/Info.plist

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+	<dict>
+		<key>CFBundleExecutable</key>
+		<string>BundleGeneratorTest</string>
+		<key>CFBundleIconFile</key>
+		<string>BundleGeneratorTest.icns</string>
+		<key>CFBundleInfoDictionaryVersion</key>
+		<string>6.0</string>
+		<key>CFBundlePackageType</key>
+		<string>APPL</string>
+	</dict>
+</plist>

cmake/MultiCPackConfig.cmake

@@ -0,0 +1,6 @@
+include("release/CPackConfig.cmake")
+
+set(CPACK_INSTALL_CMAKE_PROJECTS
+        "debug;stdarc_c;ALL;/"
+        "release;stdarc_c;ALL;/"
+)

cmake/README.txt

@@ -0,0 +1 @@
+Small file archivers (zip, pak, tar), virtual filesystem (vfs) and dir listing in a single-file header.

cmake/Welcome.txt

@@ -0,0 +1,3 @@
+Small file archivers (zip, pak, tar), virtual filesystem (vfs) and dir listing in a single-file header.
+
+https://github.com/r-lyeh/stdarc.c

cmake/config.h.in

@@ -0,0 +1,9 @@
+#ifndef stdarc_c_CONFIG_H
+#define stdarc_c_CONFIG_H
+
+#define stdarc_c_VERSION_MAJOR @stdarc_c_VERSION_MAJOR@
+#define stdarc_c_VERSION_MINOR @stdarc_c_VERSION_MINOR@
+#define stdarc_c_VERSION_PATCH @stdarc_c_VERSION_PATCH@
+#define stdarc_c_VERSION "@stdarc_c_VERSION@"
+
+#endif /* stdarc_c_CONFIG_H */

demo/CMakeLists.txt

@@ -0,0 +1,35 @@
+set(exec_name_prefix "stdarc")
+
+
+foreach(name "dir" "pak" "tar" "vfs" "zip")
+    set(EXEC_NAME "${exec_name_prefix}_${name}")
+    set(Source_Files "demo_${name}.c")
+    source_group("Source Files" FILES "${Source_Files}")
+
+    add_library("${EXEC_NAME}" "${LIBRARY_TYPE_FLAG}" "${Source_Files}")
+
+    target_include_directories(
+            "${EXEC_NAME}"
+            PUBLIC
+            "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>"
+            "$<INSTALL_INTERFACE:include>"
+    )
+    set_target_properties(
+            "${EXEC_NAME}"
+            PROPERTIES
+            LINKER_LANGUAGE
+            C
+    )
+    target_link_libraries("${EXEC_NAME}" PRIVATE "${LIBRARY_NAME}")
+
+    # install rules
+
+    set(installable_libs "${EXEC_NAME}" "${PROJECT_NAME}_compiler_flags")
+
+    if (TARGET "${DEPENDANT_LIBRARY}")
+        list(APPEND installable_libs "${DEPENDANT_LIBRARY}")
+    endif ()
+    install(TARGETS ${installable_libs}
+            DESTINATION "bin"
+            EXPORT "${EXEC_NAME}Targets")
+endforeach()

demo/demo_dir.c

@@ -8,7 +8,8 @@ int main(int argc, char **argv) {
     printf("list contents of %s ...\n", fname);
     dir *t = dir_open(fname, "rb");
     if( t ) {
-        for( unsigned i = 0 ; i < dir_count(t); ++i ) {
+        unsigned i;
+        for( i = 0 ; i < dir_count(t); ++i ) {
             printf("Y %3d) %11u %s\t%s\n", i+1, dir_size(t,i), dir_name(t,i), dir_file(t,i) ? "" : "<dir>");
         }
         dir_close(t);

demo/demo_pak.c

@@ -10,7 +10,8 @@ int main(int argc, char **argv) {
     pak *z = pak_open("demo.pak", "a+b");
     if( z ) {
         const char *fname = __FILE__;
-        for( FILE *fp = fopen(fname, "rb"); fp; fclose(fp), fp = 0) {
+        FILE *fp;
+        for( fp = fopen(fname, "rb"); fp; fclose(fp), fp = 0 ) {
             pak_append_file(z, fname, fp);
         }
         pak_close(z);
@@ -21,7 +22,8 @@ int main(int argc, char **argv) {
     printf("testing files in %s ...\n", fname);
     z = pak_open(fname, "rb");
     if( z ) {
-        for( unsigned i = 0 ; i < pak_count(z); ++i ) {
+        unsigned i;
+        for( i = 0 ; i < pak_count(z); ++i ) {
             printf("  %d) ", i+1);
             printf("@%08x ", pak_offset(z,i));
             printf("%11u ", pak_size(z,i));

demo/demo_tar.c

@@ -8,7 +8,8 @@ int main(int argc, char **argv) {
     printf("list contents of %s ...\n", fname);
     tar *t = tar_open(fname, "rb");
     if( t ) {
-        for( unsigned i = 0 ; i < tar_count(t); ++i ) {
+        unsigned i;
+        for( i = 0 ; i < tar_count(t); ++i ) {
             printf("  %d) @%08x %11u %s ", i+1, tar_offset(t,i), tar_size(t,i), tar_name(t,i));
             void *data = tar_extract(t,i);
             printf("\r%c\n", data ? 'Y':'N'); // use data here: "%.*s\n",tar_size(t,i),(char*)data

demo/demo_zip.c

@@ -13,7 +13,8 @@ int main(int argc, const char **argv) {
     zip *z = zip_open("demo.zip", "a+b");
     if( z ) {
         // compress with DEFLATE|6. Other compressors are also supported (try LZMA|5, ULZ|9, LZ4X|3, etc.)
-        for( FILE *myfile = fopen(__FILE__, "rb"); myfile; fclose(myfile), myfile = 0) {
+        FILE *myfile;
+        for( myfile = fopen(__FILE__, "rb"); myfile; fclose(myfile), myfile = 0 ) {
             zip_append_file(z, __FILE__, myfile, 6);
         }
         zip_close(z);
@@ -26,7 +27,8 @@ int main(int argc, const char **argv) {
     printf("testing files in %s ...\n", infile);
     z = zip_open(infile, "rb");
     if( z ) {
-        for( unsigned i = 0 ; i < zip_count(z); ++i ) {
+        unsigned i;
+        for( i = 0 ; i < zip_count(z); ++i ) {
             printf("  %d) ", i+1);
             printf("[%08X] ", zip_hash(z,i));
             printf("$%02X ", zip_codec(z,i));

src/CMakeLists.txt

@@ -0,0 +1,51 @@
+set(LIBRARY_NAME "stdarc")
+
+set(Header_Files "arc.h")
+source_group("Header Files" FILES "${Header_Files}")
+
+set(Source_Files
+        "dir.c"
+        "pak.c"
+        "tar.c"
+        "vfs.c"
+        "zip.c"
+        )
+source_group("Source Files" FILES "${Source_Files}")
+
+add_library("${LIBRARY_NAME}" "${LIBRARY_TYPE_FLAG}" "${Header_Files}" "${Source_Files}")
+
+target_include_directories(
+        "${LIBRARY_NAME}"
+        PUBLIC
+        "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>"
+        "$<INSTALL_INTERFACE:include>"
+)
+set_target_properties(
+        "${LIBRARY_NAME}"
+        PROPERTIES
+        LINKER_LANGUAGE
+        C
+)
+
+# Symbol exporter
+include(GenerateExportHeader)
+set(_export_file "${CMAKE_CURRENT_SOURCE_DIR}/${LIBRARY_NAME}_export.h")
+generate_export_header("${LIBRARY_NAME}" EXPORT_FILE_NAME "${_export_file}")
+
+#################
+# install rules #
+#################
+
+# setup the version numbering
+set_property(TARGET "${LIBRARY_NAME}" PROPERTY VERSION "1.0.0")
+set_property(TARGET "${LIBRARY_NAME}" PROPERTY SOVERSION "1")
+
+set(installable_libs "${LIBRARY_NAME}" "${PROJECT_NAME}_compiler_flags")
+install(FILES "${Header_Files}" "${_export_file}"  DESTINATION "include")
+
+if (TARGET "${DEPENDANT_LIBRARY}")
+    list(APPEND installable_libs "${DEPENDANT_LIBRARY}")
+endif ()
+install(TARGETS ${installable_libs}
+        DESTINATION "bin"
+        EXPORT "${LIBRARY_NAME}Targets")