cleanup(scap): move strl.h into libscap

Yes, the strl* functions are used in libsinsp too, but that doesn't make them too different from all the other helper functions. Eventually this could become a tiny library of its own but we're not quite there yet. Signed-off-by: Grzegorz Nosek <[email protected]>
falcosecurity · Nov 2, 2023 · dfb2a15 · dfb2a15
1 parent 5ee8c6c
commit dfb2a15
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/cmake/modules/libscap.cmake b/cmake/modules/libscap.cmake
@@ -44,7 +44,6 @@ else()
 	message(STATUS "No strlcat found, will use local definition")
 endif()
 
-configure_file(${LIBSCAP_DIR}/userspace/common/common_config.h.in ${PROJECT_BINARY_DIR}/common/common_config.h)
 include_directories(${PROJECT_BINARY_DIR}/common)
 
 add_definitions(-DPLATFORM_NAME="${CMAKE_SYSTEM_NAME}")
@@ -148,5 +147,6 @@ install(DIRECTORY "${LIBSCAP_DIR}/userspace/plugin" DESTINATION "${CMAKE_INSTALL
 		COMPONENT "scap"
 		FILES_MATCHING PATTERN "*.h")
 install(FILES ${PROJECT_BINARY_DIR}/libscap/scap_config.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${LIBS_PACKAGE_NAME}/userspace/libscap)
+install(FILES ${PROJECT_BINARY_DIR}/libscap/scap_strl_config.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${LIBS_PACKAGE_NAME}/userspace/libscap)
 install(FILES ${PROJECT_BINARY_DIR}/libscap/libscap.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 endif()
diff --git a/userspace/libscap/CMakeLists.txt b/userspace/libscap/CMakeLists.txt
@@ -62,6 +62,8 @@ endif()
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scap_strl_config.h.in ${CMAKE_CURRENT_BINARY_DIR}/scap_strl_config.h)
+
 add_library(scap
 	scap.c
 	scap_api_version.c

diff --git a/userspace/common/common_config.h.in → userspace/libscap/scap_strl_config.h.in b/userspace/common/common_config.h.in → userspace/libscap/scap_strl_config.h.in
diff --git a/userspace/common/strl.h → userspace/libscap/strl.h b/userspace/common/strl.h → userspace/libscap/strl.h
@@ -17,7 +17,7 @@ limitations under the License.
 
 #include <sys/types.h>
 #include <string.h>
-#include "common_config.h"
+#include "scap_strl_config.h"
 
 #pragma once