diff options
| author | Eugene Triguba <eugenetriguba@gmail.com> | 2024-07-04 15:01:30 -0400 |
|---|---|---|
| committer | Eugene Triguba <eugenetriguba@gmail.com> | 2024-07-04 15:01:30 -0400 |
| commit | 6f296b296842c98b590c1686fb254ef1accf19b5 (patch) | |
| tree | adce093c2189150954e9c525a72f97f61e64852d | |
| parent | use ubuntu 24 (diff) | |
| download | cli-6f296b296842c98b590c1686fb254ef1accf19b5.zip | |
Optionally include strlcat
| -rw-r--r-- | .github/workflows/test.yml | 6 | ||||
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/strlcat.h | 39 |
3 files changed, 47 insertions, 4 deletions
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1f88b2a..05ebee9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -4,7 +4,7 @@ on: [push, pull_request] jobs: test: - runs-on: ubuntu-24.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 @@ -15,9 +15,7 @@ jobs: echo "path=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT" - name: Install dependencies - run: | - sudo apt-get update - sudo apt-get install -y libcmocka-dev + run: sudo apt-get install -y libcmocka-dev - name: Configure CMake run: > diff --git a/CMakeLists.txt b/CMakeLists.txt index 27230b8..aa4eb23 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,6 +10,12 @@ if (CMAKE_C_COMPILER_ID STREQUAL "Clang") add_compile_options(-Wall -Wextra -ansi) endif() +include(CheckFunctionExists) +check_function_exists(strlcat HAVE_STRLCAT) +if(NOT HAVE_STRLCAT) + add_definitions(-DHAVE_STRLCAT=1) +endif() + set(SRC_FILES src/linebuffer.c src/word.c diff --git a/src/strlcat.h b/src/strlcat.h new file mode 100644 index 0000000..1af6bb1 --- /dev/null +++ b/src/strlcat.h @@ -0,0 +1,39 @@ +#ifndef HAVE_STRLCAT +#define HAVE_STRLCAT + +#include <stddef.h> +#include <string.h> + +/* + * Appends src to string dst of size siz (unlike strncat, siz is the + * full size of dst, not space left). At most siz-1 characters + * will be copied. Always NUL terminates (unless siz <= strlen(dst)). + * Returns strlen(src) + MIN(siz, strlen(initial dst)). + * If retval >= siz, truncation occurred. + */ +size_t strlcat(char *dst, const char *src, size_t siz) { + char *d = dst; + const char *s = src; + size_t n = siz; + size_t dlen; + + /* Find the end of dst and adjust bytes left but don't go past end */ + while (n-- != 0 && *d != '\0') + d++; + dlen = d - dst; + n = siz - dlen; + + if (n == 0) return (dlen + strlen(s)); + while (*s != '\0') { + if (n != 1) { + *d++ = *s; + n--; + } + s++; + } + *d = '\0'; + + return (dlen + (s - src)); +} + +#endif /* HAVE_STRLCAT */ |