From f5bf71f535550f43e4966031f84b49c052fa351b Mon Sep 17 00:00:00 2001 From: klemek Date: Mon, 10 Nov 2025 14:05:02 +0100 Subject: [PATCH] fix: strlcpy could be in libbsd --- .github/workflows/ci.yml | 6 +++--- Makefile.am | 2 +- Makefile.dev | 2 +- README.md | 1 + configure.ac | 2 ++ src/project.c | 1 + src/string.c | 1 + 7 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5f71cc3..e869e72 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,9 +14,9 @@ jobs: with: submodules: 'true' - name: install libs - run: sudo apt install -y libglfw3-dev libgl-dev libv4l-dev libasound2-dev + run: sudo apt install -y libglfw3-dev libgl-dev libv4l-dev libasound2-dev libbsd-dev - name: gcc - run: mkdir -p build && gcc -v -Wall -Wextra -Werror -Wno-format-truncation src/*.c src/*.h -lglfw -lGL -lm -lasound -Iinclude hashmap.c/hashmap.c log.c/src/log.c -DGLFW_INCLUDE_NONE -DGLFW_EXPOSE_NATIVE_EGL -DGLFW_NATIVE_INCLUDE_NONE + run: mkdir -p build && gcc -v -Wall -Wextra -Werror -Wno-format-truncation src/*.c src/*.h -lglfw -lGL -lm -lasound -lbsd -Iinclude hashmap.c/hashmap.c log.c/src/log.c -DGLFW_INCLUDE_NONE -DGLFW_EXPOSE_NATIVE_EGL -DGLFW_NATIVE_INCLUDE_NONE build-release: needs: lint @@ -26,7 +26,7 @@ jobs: with: submodules: 'true' - name: install libs - run: sudo apt install -y libglfw3-dev libgl-dev libv4l-dev libasound2-dev + run: sudo apt install -y libglfw3-dev libgl-dev libv4l-dev libasound2-dev libbsd-dev - name: aclocal run: aclocal - name: autoconf diff --git a/Makefile.am b/Makefile.am index 381fca1..f2afe7b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign subdir-objects -Wall bin_PROGRAMS = forge forge_SOURCES = src/args.c src/arr.c src/config_file.c src/file.c src/forge.c src/main.c src/midi.c src/preo src/rand.c src/shaders.c src/shared.c src/state.c src/string.c src/tempo.c src/timer.c src/video.c src/window.c $(top_srcdir)/include/glad/gl.h $(top_srcdir)/include/glad/egl.h $(top_srcdir)/hashmap.c/hashmap.c $(top_srcdir)/log.c/src/log.c forge_CFLAGS = -Ofast -march=native -flto -funroll-loops -fprefetch-loop-arrays -fno-exceptions -fopenmp -I$(top_srcdir)/include -DGLFW_INCLUDE_NONE -DGLFW_EXPOSE_NATIVE_EGL -DGLFW_NATIVE_INCLUDE_NONE -DLOG_USE_COLOR -DDATADIR=\"$(datadir)/$(PACKAGE)\" -forge_LDADD = -lm -lGL -lglfw -lasound +forge_LDADD = -lm -lGL -lglfw -lasound -lbsd include_HEADERS = src/args.h src/arr.h src/config.h src/config_file.h src/constants.h src/file.h src/forge.h src/main.h src/midi.h src/project.h src/rand.h src/shaders.h src/shared.h src/state.h src/string.h src/tempo.h src/timer.h src/types.h src/video.h src/window.h $(top_srcdir)/include/glad/gl.h $(top_srcdir)/include/glad/egl.h $(top_srcdir)/include/linmath.h $(top_srcdir)/include/hashmap.h $(top_srcdir)/include/log.h EXTRA_DIST = default/forge_project.cfg default/frag0.glsl default/frag1.glsl default/frag2.glsl default/frag3.glsl default/frag4.glsl default/frag5.glsl default/frag6.glsl default/frag7.glsl default/frag8.glsl default/frag9.glsl default/frag10.glsl diff --git a/Makefile.dev b/Makefile.dev index 8a3023f..650fc32 100644 --- a/Makefile.dev +++ b/Makefile.dev @@ -14,7 +14,7 @@ build: -Iinclude \ hashmap.c/hashmap.c \ log.c/src/log.c \ - -lm -lGL -lglfw -lasound \ + -lm -lGL -lglfw -lasound -lbsd \ -Wall -Wextra \ -Wno-format-truncation \ -DGLFW_INCLUDE_NONE \ diff --git a/README.md b/README.md index 0e5c40a..a86c0c2 100644 --- a/README.md +++ b/README.md @@ -54,6 +54,7 @@ TODO | libGL | libgl-dev | extra/libglvnd | | libasound | libasound2-dev | extra/alsa-lib | | libv4l2 | libv4l-dev | extra/v4l-utils | +| libbsd | libbsd-dev | extra/libbsd | ### From release diff --git a/configure.ac b/configure.ac index 75ee43c..77fb6fc 100644 --- a/configure.ac +++ b/configure.ac @@ -23,6 +23,8 @@ AC_CHECK_HEADERS([string.h]) AC_CHECK_HEADERS([time.h]) AC_CHECK_HEADERS([unistd.h]) +AC_CHECK_HEADERS([bsd/string.h]) + AC_CHECK_HEADERS([linux/videodev2.h]) AC_CHECK_HEADERS([alsa/rawmidi.h]) diff --git a/src/project.c b/src/project.c index 04eec62..43d53da 100644 --- a/src/project.c +++ b/src/project.c @@ -1,3 +1,4 @@ +#include #include #include "types.h" diff --git a/src/string.c b/src/string.c index b478117..1e5a420 100644 --- a/src/string.c +++ b/src/string.c @@ -1,3 +1,4 @@ +#include #include #include #include