Changeset 849:d7f940afd933 in freeDiameter

Timestamp:

Oct 22, 2012, 12:12:13 AM (12 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

New portability function: strndup

Files:

• include/freeDiameter/CMakeLists.txt (modified) (1 diff)
• include/freeDiameter/freeDiameter-host.h.in (modified) (1 diff)
• include/freeDiameter/libfdproto.h (modified) (1 diff)
• libfdproto/portability.c (modified) (1 diff)

include/freeDiameter/CMakeLists.txt

@@ -63 +63 @@
 # malloc.h ?
 CHECK_INCLUDE_FILES (malloc.h HAVE_MALLOC_H)
+
+# strndup ? Missing on OS X
+CHECK_FUNCTION_EXISTS (strndup HAVE_STRNDUP)
 
 

include/freeDiameter/freeDiameter-host.h.in

@@ -43 +43 @@
 #cmakedefine HAVE_AI_ADDRCONFIG
 #cmakedefine HAVE_CLOCK_GETTIME
+#cmakedefine HAVE_STRNDUP
 
 #cmakedefine HOST_BIG_ENDIAN @HOST_BIG_ENDIAN@

include/freeDiameter/libfdproto.h

@@ -612 +612 @@
 #endif /* HAVE_CLOCK_GETTIME */
 
+#ifndef HAVE_STRNDUP
+char * strndup (char const *s, size_t n);
+#endif /* HAVE_STRNDUP */
 
 

libfdproto/portability.c

@@ -46 +46 @@
 }
 #endif /* HAVE_CLOCK_GETTIME */
+
+/* Replacement for strndup for the Mac OS */
+#ifndef HAVE_STRNDUP
+char * strndup (char *str, size_t len)
+{
+        char * output;
+        size_t outlen = strnlen (str, len);
+        CHECK_MALLOC_DO( output = malloc (outlen + 1), return NULL );
+
+        output[outlen] = '\0';
+        memcpy (output, str, outlen);
+        return output;
+}
+#endif /* HAVE_STRNDUP */