C89 strictness

Author: SamuelMarks

CMakeLists.txt

@@ -55,13 +55,7 @@ configure_file(
 
 add_subdirectory("${PROJECT_NAME}")
 
-include(CTest)
-if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
-    set(C89STRINGUTILS_BUILD_TESTING_DEFAULT ON)
-else()
-    set(C89STRINGUTILS_BUILD_TESTING_DEFAULT OFF)
-endif()
-option(C89STRINGUTILS_BUILD_TESTING "Build the tests" ${C89STRINGUTILS_BUILD_TESTING_DEFAULT})
+option(BUILD_TESTING_${PROJECT_NAME} "Build the tests" ON)
 
 set(CDD_CHARSET "Unicode" CACHE STRING "Charset to use: Unicode or ANSI")
 set(CDD_THREADING "Multi-threaded" CACHE STRING "Threading: Multi-threaded or Single-threaded")
@@ -93,9 +87,12 @@ if (CDD_LTO)
     endif()
 endif()
 
-if (BUILD_TESTING AND C89STRINGUTILS_BUILD_TESTING)
-    add_subdirectory("${PROJECT_NAME}/tests")
-endif (BUILD_TESTING AND C89STRINGUTILS_BUILD_TESTING)
+if (BUILD_TESTING_${PROJECT_NAME})
+    include(CTest)
+    if (BUILD_TESTING)
+        add_subdirectory("${PROJECT_NAME}/tests")
+    endif (BUILD_TESTING)
+endif (BUILD_TESTING_${PROJECT_NAME})
 
 ###########
 # Install #

alpine.Dockerfile

@@ -8,7 +8,7 @@ WORKDIR /c89stringutils
 
 RUN cmake -DCMAKE_BUILD_TYPE="Debug" \
           -DBUILD_TESTING=1 \
-          -DC89STRINGUTILS_BUILD_TESTING=1 \
+          -DBUILD_TESTING_c89stringutils=1 \
           -S . -B build && \
     cmake --build build
 

c89stringutils/CMakeLists.txt

@@ -8,6 +8,8 @@ source_group("Source Files" FILES "${Source_Files}")
 
 add_library("${LIBRARY_NAME}" "${Header_Files}" "${Source_Files}")
 
+target_link_libraries("${LIBRARY_NAME}" PRIVATE "${PROJECT_NAME}_compiler_flags")
+
 include(GNUInstallDirs)
 target_include_directories(
         "${LIBRARY_NAME}"

c89stringutils/c89stringutils_string_extras.c

@@ -16,6 +16,20 @@
 #include <limits.h> /* for INT_MAX */
 /* clang-format on */
 
+#ifdef C89STRINGUTILS_TEST_MOCKS
+extern void *mock_malloc(size_t size);
+extern void *mock_realloc(void *ptr, size_t size);
+extern int mock_vsnprintf(char *str, size_t size, const char *format,
+                          va_list ap);
+extern char *mock_strerror(int errnum);
+#define malloc mock_malloc
+#define realloc mock_realloc
+#define wtf_vsnprintf mock_vsnprintf
+#undef vsnprintf
+#define vsnprintf mock_vsnprintf
+#define strerror mock_strerror
+#endif
+
 #if defined(__GNUC__) && __GNUC__ >= 7 && !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wnonnull-compare"
@@ -288,7 +302,6 @@ C89STRINGUTILS_EXPORT size_t c89stringutils_strerrorlen_s(errno_t errnum) {
   }
 }
 
-
 #ifndef VA_COPY
 #if defined(HAVE_VA_COPY) || defined(va_copy)
 #define VA_COPY(dest, src) va_copy(dest, src)
@@ -333,12 +346,17 @@ C89STRINGUTILS_EXPORT int c89stringutils_vasprintf(char **str, const char *fmt,
   VA_COPY(ap2, ap);
   rc = vsnprintf(string, INIT_SZ, fmt, ap2);
   va_end(ap2);
-  if (rc >= 0 && rc < INIT_SZ) { /* succeeded with initial alloc */
-    *str = string;
-  } else if (rc == INT_MAX || rc < 0) { /* Bad length */
+
+  if (rc < 0) { /* Bad length */
     free(string);
     rc = -1;
     goto fail;
+  } else if (rc == INT_MAX) { /* Bad length */
+    free(string);
+    rc = -1;
+    goto fail;
+  } else if (rc < INIT_SZ) { /* succeeded with initial alloc */
+    *str = string;
   } else { /* bigger than initial, realloc allowing for nul */
     len = (size_t)rc + 1;
     newstr = (char *)realloc(string, len);
@@ -350,7 +368,11 @@ C89STRINGUTILS_EXPORT int c89stringutils_vasprintf(char **str, const char *fmt,
     VA_COPY(ap2, ap);
     rc = vsnprintf(newstr, len, fmt, ap2);
     va_end(ap2);
-    if (rc < 0 || (size_t)rc >= len) { /* failed with realloc'ed string */
+    if (rc < 0) { /* failed with realloc'ed string */
+      free(newstr);
+      rc = -1;
+      goto fail;
+    } else if ((size_t)rc >= len) {
       free(newstr);
       rc = -1;
       goto fail;
@@ -360,23 +382,24 @@ C89STRINGUTILS_EXPORT int c89stringutils_vasprintf(char **str, const char *fmt,
   return rc;
 
 fail:
-  if (rc != 0) {
 #ifdef _MSC_VER
-    char errbuf[256];
-    int err_rc;
-    err_rc = strerror_s(errbuf, sizeof(errbuf), errno);
-    if (err_rc != 0) {
-      LOG_DEBUG("strerror_s failed with rc=%d", err_rc);
-      errbuf[0] = '\0';
-    }
-    LOG_DEBUG("vasprintf failed with rc=%d, error=%s", rc, errbuf);
+{
+  char errbuf[256];
+  int err_rc;
+  err_rc = strerror_s(errbuf, sizeof(errbuf), errno);
+  if (err_rc != 0) {
+    LOG_DEBUG("strerror_s failed with rc=%d", err_rc);
+    errbuf[0] = '\0';
+  }
+  LOG_DEBUG("vasprintf failed with rc=%d, error=%s", rc, errbuf);
+}
 #else
-    const char *errstr;
-    errstr = strerror(errno);
-    LOG_DEBUG("vasprintf failed with rc=%d, error=%s", rc,
-              errstr ? errstr : "");
+{
+  const char *errstr;
+  errstr = strerror(errno);
+  LOG_DEBUG("vasprintf failed with rc=%d, error=%s", rc, errstr ? errstr : "");
+}
 #endif
-  }
   *str = NULL;
   errno = ENOMEM;
   return -1;
@@ -490,7 +513,6 @@ C89STRINGUTILS_EXPORT int c89stringutils_jasprintf(char **unto, const char *fmt,
 #pragma GCC diagnostic pop
 #endif
 
-
 #if !defined(HAVE_ASPRINTF)
 C89STRINGUTILS_EXPORT int vasprintf(char **str, const char *fmt, va_list ap) {
   return c89stringutils_vasprintf(str, fmt, ap);

c89stringutils/c89stringutils_string_extras.h

@@ -206,12 +206,38 @@ extern C89STRINGUTILS_EXPORT int c89stringutils_asprintf(char **str,
 extern C89STRINGUTILS_EXPORT int c89stringutils_jasprintf(char **unto,
                                                           const char *fmt, ...);
 
-
 #if !defined(HAVE_ASPRINTF)
-extern C89STRINGUTILS_EXPORT int vasprintf(char **str, const char *fmt, va_list ap);
+/**
+ * @brief Write formatted output to a dynamically allocated string using a
+ * va_list.
+ * @param str A pointer to a string pointer where the allocated string will be
+ * stored.
+ * @param fmt The format string.
+ * @param ap The va_list of arguments.
+ * @return The number of characters printed, or -1 on error.
+ */
+extern C89STRINGUTILS_EXPORT int vasprintf(char **str, const char *fmt,
+                                           va_list ap);
+
+/**
+ * @brief Write formatted output to a dynamically allocated string.
+ * @param str A pointer to a string pointer where the allocated string will be
+ * stored.
+ * @param fmt The format string.
+ * @param ... The arguments.
+ * @return The number of characters printed, or -1 on error.
+ */
 extern C89STRINGUTILS_EXPORT int asprintf(char **str, const char *fmt, ...);
 #endif
 
+/**
+ * @brief `jasprintf`, a version of `asprintf` that concatenates on successive
+ * calls.
+ * @param unto The string to append to.
+ * @param fmt The format string.
+ * @param ... The arguments.
+ * @return The number of characters printed, or -1 on error.
+ */
 extern C89STRINGUTILS_EXPORT int jasprintf(char **unto, const char *fmt, ...);
 
 #ifdef __cplusplus

c89stringutils/tests/CMakeLists.txt

@@ -26,18 +26,21 @@ endif (NOT CMAKE_SYSTEM_NAME STREQUAL "SunOS")
 set(Header_Files "test_string_extras.h")
 source_group("Header Files" FILES "${Header_Files}")
 
-set(Source_Files "test.c")
+set(Source_Files "test.c" "${CMAKE_CURRENT_SOURCE_DIR}/../c89stringutils_string_extras.c")
 source_group("Source Files" FILES "${Source_Files}")
 
 add_executable("${EXEC_NAME}" "${Header_Files}" "${Source_Files}")
 
-target_link_libraries("${EXEC_NAME}" PRIVATE "${PROJECT_NAME}")
+target_compile_definitions("${EXEC_NAME}" PRIVATE C89STRINGUTILS_TEST_MOCKS)
+
 if (NOT CMAKE_C_COMPILER_ID STREQUAL "OpenWatcom")
     target_link_libraries("${EXEC_NAME}" PRIVATE "${PROJECT_NAME}_compiler_flags")
 endif (NOT CMAKE_C_COMPILER_ID STREQUAL "OpenWatcom")
 target_include_directories(
         "${EXEC_NAME}"
         PRIVATE
+        "${CMAKE_CURRENT_SOURCE_DIR}/.."
+        "${CMAKE_BINARY_DIR}"
         "$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/src>"
         "$<BUILD_INTERFACE:${DOWNLOAD_DIR}>"
 )

c89stringutils/tests/test.c

@@ -5,6 +5,42 @@
 /* clang-format off */
 #include <greatest.h>
 #include <c89stringutils_log.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+int g_mock_malloc_fail = 0;
+int g_mock_realloc_fail = 0;
+int g_mock_vsnprintf_fail = 0;
+int g_mock_vsnprintf_ret = 0;
+int g_mock_strerror_null = 0;
+
+void *mock_malloc(size_t size) {
+  if (g_mock_malloc_fail) return NULL;
+  return malloc(size);
+}
+
+void *mock_realloc(void *ptr, size_t size) {
+  if (g_mock_realloc_fail) return NULL;
+  return realloc(ptr, size);
+}
+
+int g_mock_vsnprintf_fail_call = 0;
+int g_mock_vsnprintf_call_count = 0;
+int g_mock_vsnprintf_ret2 = 0; /* for second call */
+
+int mock_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
+  g_mock_vsnprintf_call_count++;
+  if (g_mock_vsnprintf_fail_call == g_mock_vsnprintf_call_count) return g_mock_vsnprintf_ret2;
+  if (g_mock_vsnprintf_fail) return g_mock_vsnprintf_ret < 0 ? -1 : g_mock_vsnprintf_ret;
+  return vsnprintf(str, size, format, ap);
+}
+
+char *mock_strerror(int errnum) {
+  if (g_mock_strerror_null) return NULL;
+  return strerror(errnum);
+}
 
 #include "test_string_extras.h"
 /* clang-format on */