Added support for strdup macro replacement on tests. Using auto generated config file.

Author: flplv

configure.ac

@@ -60,7 +60,7 @@ AC_TYPE_LONG_LONG_INT
 
 # Checks for library functions.
 AC_FUNC_FORK
-AC_CHECK_FUNCS([gettimeofday memset strstr])
+AC_CHECK_FUNCS([gettimeofday memset strstr strdup])
 
 AC_CHECK_PROG([CPPUTEST_HAS_GCC], [gcc], [yes], [no])
 AC_CHECK_PROG([CPPUTEST_HAS_CLANG], [clang], [yes], [no])

include/CppUTest/MemoryLeakDetectorMallocMacros.h

@@ -22,6 +22,7 @@ extern "C"
 #endif
 
 extern void* cpputest_malloc_location(size_t size, const char* file, int line);
+extern char* cpputest_strdup_location(const char* str, const char* file, int line);
 extern void* cpputest_calloc_location(size_t count, size_t size, const char* file, int line);
 extern void* cpputest_realloc_location(void *, size_t, const char* file, int line);
 extern void cpputest_free_location(void* buffer, const char* file, int line);
@@ -34,18 +35,10 @@ extern void crash_on_allocation_number(unsigned number);
 
 #endif
 
-/* NOTE on strdup!
- *
- * strdup was implemented earlier, however it is *not* an Standard C function but a POSIX function.
- * Because of that, it can lead to portability issues by providing more than is available on the local platform.
- * For that reason, strdup is *not* implemented as a macro. If you still want to use it, an easy implementation would be:
- *
- * size_t length = 1 + strlen(str);
- * char* result = (char*) cpputest_malloc_location(length, file, line);
- * memcpy(result, str, length);
- * return result;
- *
- */
+#ifdef CPPUTEST_HAVE_STRDUP
+#define strdup(str) cpputest_strdup_location(str, __FILE__, __LINE__)
+#define CPPUTEST_USE_STRDUP_MACROS 1
+#endif
 
 #define malloc(a) cpputest_malloc_location(a, __FILE__, __LINE__)
 #define calloc(a, b) cpputest_calloc_location(a, b, __FILE__, __LINE__)

include/CppUTest/TestHarness_c.h

@@ -173,11 +173,13 @@ extern void CHECK_C_LOCATION(int condition, const char* conditionString,
         const char* fileName, int lineNumber);
 
 extern void* cpputest_malloc(size_t size);
+extern char* cpputest_strdup(const char* str);
 extern void* cpputest_calloc(size_t num, size_t size);
 extern void* cpputest_realloc(void* ptr, size_t size);
 extern void  cpputest_free(void* buffer);
 
 extern void* cpputest_malloc_location(size_t size, const char* file, int line);
+extern char* cpputest_strdup_location(const char* str, const char* file, int line);
 extern void* cpputest_calloc_location(size_t num, size_t size,
         const char* file, int line);
 extern void* cpputest_realloc_location(void* memory, size_t size,

src/CppUTest/TestHarness_c.cpp

@@ -34,7 +34,6 @@
 extern "C"
 {
 
-
 void CHECK_EQUAL_C_BOOL_LOCATION(int expected, int actual, const char* fileName, int lineNumber)
 {
     UtestShell::getCurrent()->assertEquals(!!expected != !!actual, expected ? "true" : "false", actual ? "true" : "false", NULL, fileName, lineNumber, TestTerminatorWithoutExceptions());
@@ -157,6 +156,11 @@ void* cpputest_malloc(size_t size)
     return cpputest_malloc_location(size, "<unknown>", 0);
 }
 
+char* cpputest_strdup(const char* str)
+{
+    return cpputest_strdup_location(str, "<unknown>", 0);
+}
+
 void* cpputest_calloc(size_t num, size_t size)
 {
     return cpputest_calloc_location(num, size, "<unknown>", 0);
@@ -193,6 +197,21 @@ void* cpputest_malloc_location(size_t size, const char* file, int line)
     return cpputest_malloc_location_with_leak_detection(size, file, line);
 }
 
+static size_t strlen(const char * str)
+{
+	size_t n = 0;
+	while (*str++) n++;
+	return n;
+}
+
+char* cpputest_strdup_location(const char * str, const char* file, int line)
+{
+	 size_t length = 1 + strlen(str);
+	 char* result = (char*) cpputest_malloc_location(length, file, line);
+	 PlatformSpecificMemCpy(result, str, length);
+	 return result;
+}
+
 void* cpputest_calloc_location(size_t num, size_t size, const char* file, int line)
 {
     void* mem = cpputest_malloc_location(num * size, file, line);

src/Platforms/C2000/UtestPlatform.cpp

@@ -34,6 +34,7 @@
 #undef free
 #undef calloc
 #undef realloc
+#undef strdup
 
 #define  far  // eliminate "meaningless type qualifier" warning
 #include <time.h>

src/Platforms/Dos/UtestPlatform.cpp

@@ -34,6 +34,7 @@
 #undef free
 #undef calloc
 #undef realloc
+#undef strdup
 
 #define  far  // eliminate "meaningless type qualifier" warning
 #include <time.h>

src/Platforms/Gcc/UtestPlatform.cpp

@@ -31,6 +31,7 @@
 #undef free
 #undef calloc
 #undef realloc
+#undef strdup
 
 #include <sys/time.h>
 #include <time.h>

src/Platforms/GccNoStdC/UtestPlatform.cpp

@@ -30,6 +30,7 @@
 #undef free
 #undef calloc
 #undef realloc
+#undef strdup
 
 #include "CppUTest/PlatformSpecificFunctions.h"
 

src/Platforms/Iar/UtestPlatform.cpp

@@ -39,6 +39,7 @@
 #undef calloc
 #undef realloc
 #undef free
+#undef strdup
 #include "CppUTest/PlatformSpecificFunctions.h"
 
 static jmp_buf test_exit_jmp_buf[10];

src/Platforms/Keil/UtestPlatform.cpp

@@ -31,6 +31,7 @@
 #undef free
 #undef calloc
 #undef realloc
+#undef strdup
 
 #define  far  // eliminate "meaningless type qualifier" warning
 #include <time.h>