diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9b0b8d7..15fd68b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,15 +1,15 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) -set(SOURCES "main.c" "strlfuncs.c" "logfile.c" "log.c" "matches.c" "ipaddr.c" "filelist.c" "filter.c" "config.c" "jail.c" "backend.c") +set(SOURCES "main.c" "strlcpy.c" "logfile.c" "log.c" "matches.c" "ipaddr.c" "filelist.c" "filter.c" "config.c" "jail.c" "backend.c") add_executable("f2b" ${SOURCES}) target_link_libraries(f2b "dl") -set(SOURCES "strlfuncs.c" "backend-test.c" "log.c" "config.c" "backend.c") +set(SOURCES "strlcpy.c" "backend-test.c" "log.c" "config.c" "backend.c") add_executable("backend-test" ${SOURCES}) target_link_libraries("backend-test" "dl") -set(SOURCES "strlfuncs.c" "filter-test.c" "log.c" "config.c" "filter.c") +set(SOURCES "strlcpy.c" "filter-test.c" "log.c" "config.c" "filter.c") add_executable("filter-test" ${SOURCES}) target_link_libraries("filter-test" "dl") diff --git a/src/common.h b/src/common.h index 48c7a15..9594471 100644 --- a/src/common.h +++ b/src/common.h @@ -24,7 +24,7 @@ #include #include -#include "strlfuncs.h" +#include "strlcpy.h" #define UNUSED(x) (void)(x) diff --git a/src/strlfuncs.c b/src/strlcpy.c similarity index 100% rename from src/strlfuncs.c rename to src/strlcpy.c diff --git a/src/strlfuncs.h b/src/strlcpy.h similarity index 100% rename from src/strlfuncs.h rename to src/strlcpy.h diff --git a/t/CMakeLists.txt b/t/CMakeLists.txt index 109f3f1..8771499 100644 --- a/t/CMakeLists.txt +++ b/t/CMakeLists.txt @@ -2,10 +2,10 @@ enable_testing() set(SRC_DIR "../src") -add_executable("t_logfile" "t_logfile.c" "${SRC_DIR}/strlfuncs.c" "${SRC_DIR}/logfile.c") -add_executable("t_matches" "t_matches.c" "${SRC_DIR}/strlfuncs.c" "${SRC_DIR}/matches.c") -add_executable("t_ipaddr" "t_ipaddr.c" "${SRC_DIR}/strlfuncs.c" "${SRC_DIR}/matches.c" "${SRC_DIR}/ipaddr.c") -add_executable("t_config_param" "t_config_param.c" "${SRC_DIR}/strlfuncs.c" "${SRC_DIR}/config.c" "${SRC_DIR}/log.c") +add_executable("t_logfile" "t_logfile.c" "${SRC_DIR}/strlcpy.c" "${SRC_DIR}/logfile.c") +add_executable("t_matches" "t_matches.c" "${SRC_DIR}/strlcpy.c" "${SRC_DIR}/matches.c") +add_executable("t_ipaddr" "t_ipaddr.c" "${SRC_DIR}/strlcpy.c" "${SRC_DIR}/matches.c" "${SRC_DIR}/ipaddr.c") +add_executable("t_config_param" "t_config_param.c" "${SRC_DIR}/strlcpy.c" "${SRC_DIR}/config.c" "${SRC_DIR}/log.c") add_test("tests/f2b_logfile_*" "t_logfile") add_test("tests/f2b_matches_*" "t_matches")