Merge pull request #85 from turbolent/static-dynamic-separation

Separate dynamic and static functions based on reference module

.github/workflows/tests.yml

@@ -77,7 +77,7 @@ jobs:
         env:
           LDFLAGS: -static
         working-directory: ./w2c2
-        run: make BUILD=${{ matrix.build }} FEATURES="unistd libgen getopt ${{ matrix.threads && 'threads' || '' }}"
+        run: make BUILD=${{ matrix.build }} FEATURES="unistd libgen getopt glob ${{ matrix.threads && 'threads' || '' }}"
       - if: steps.changes.outputs.w2c2 == 'true'
         name: Run w2c2 tests
         env:
@@ -114,7 +114,7 @@ jobs:
       - if: steps.changes.outputs.w2c2 == 'true'
         name: Build w2c2
         working-directory: ./w2c2
-        run: make BUILD=${{ matrix.build }} FEATURES="unistd libgen getopt ${{ matrix.threads && 'threads' || '' }}"
+        run: make BUILD=${{ matrix.build }} FEATURES="unistd libgen getopt glob ${{ matrix.threads && 'threads' || '' }}"
       - if: steps.changes.outputs.w2c2 == 'true'
         name: Run tests
         working-directory: ./tests

w2c2/CMakeLists.txt

@@ -22,6 +22,7 @@ include(CheckIncludeFile)
 check_include_file(getopt.h HAVE_GETOPT_H)
 check_include_file(libgen.h HAVE_LIBGEN_H)
 check_include_file(unistd.h HAVE_UNISTD_H)
+check_include_file(glob.h HAVE_GLOB_H)
 
 include(CheckSymbolExists)
 check_symbol_exists(strdup string.h HAVE_STRDUP)
@@ -77,6 +78,10 @@ foreach(TARGET w2c2 w2c2_test)
         target_compile_definitions(${TARGET} PUBLIC HAS_STRDUP=1)
     endif()
 
+    if(HAVE_GLOB_H)
+        target_compile_definitions(${TARGET} PUBLIC HAS_GLOB=1)
+    endif()
+
     if(MSVC)
         target_compile_definitions(${TARGET} PUBLIC _CRT_SECURE_NO_DEPRECATE)
     endif()

w2c2/Makefile

@@ -27,7 +27,8 @@ CFLAGS += -std=c89 $(WARNS)
 # - unistd.h
 # - libgen.h
 # - strdup
-FEATURES ?= threads getopt unistd libgen strdup
+# - glob
+FEATURES ?= threads getopt unistd libgen strdup glob
 
 ifeq ($(UNAME),Windows)
 	OUTPUT := w2c2.exe
@@ -62,6 +63,10 @@ ifneq (,$(findstring strdup,$(FEATURES)))
 	CFLAGS += -DHAS_STRDUP=1
 endif
 
+ifneq (,$(findstring glob,$(FEATURES)))
+	CFLAGS += -DHAS_GLOB=1
+endif
+
 ifneq (,$(findstring debugging,$(FEATURES)))
 	CFLAGS += -DHAS_LIBDWARF=1
 	LDFLAGS += -ldwarf