Date: Wednesday, January 17, 2007 @ 13:28:23
Author: csaba
Path: /cvsroot/carob/libmysequoia
Modified: configure.ac (1.22 -> 1.23) include/Utils.hpp (1.22 -> 1.23)
src/Utils.cpp (1.46 -> 1.47)
Check for strnlen() and if not found implement it.
-------------------+
configure.ac | 2 +-
include/Utils.hpp | 4 ++++
src/Utils.cpp | 10 ++++++++++
3 files changed, 15 insertions(+), 1 deletion(-)
Index: libmysequoia/configure.ac
diff -u libmysequoia/configure.ac:1.22 libmysequoia/configure.ac:1.23
--- libmysequoia/configure.ac:1.22 Tue Jan 16 09:28:31 2007
+++ libmysequoia/configure.ac Wed Jan 17 13:28:23 2007
@@ -231,7 +231,7 @@
AC_C_CONST
# Checks for library functions.
-AC_CHECK_FUNCS([memset])
+AC_CHECK_FUNCS([memset strnlen])
CFG_DIR=$sysconfdir
CFG_DIR=`(
Index: libmysequoia/include/Utils.hpp
diff -u libmysequoia/include/Utils.hpp:1.22 libmysequoia/include/Utils.hpp:1.23
--- libmysequoia/include/Utils.hpp:1.22 Mon Apr 10 09:34:50 2006
+++ libmysequoia/include/Utils.hpp Wed Jan 17 13:28:23 2007
@@ -25,6 +25,10 @@
#include <string.h>
#include <string>
+#ifndef HAVE_STRNLEN
+size_t strnlen(const char *s, size_t maxlen);
+#endif
+
//MySQL includes
#include <mysql_wrapper.h>
Index: libmysequoia/src/Utils.cpp
diff -u libmysequoia/src/Utils.cpp:1.46 libmysequoia/src/Utils.cpp:1.47
--- libmysequoia/src/Utils.cpp:1.46 Wed Dec 27 10:29:33 2006
+++ libmysequoia/src/Utils.cpp Wed Jan 17 13:28:23 2007
@@ -111,6 +111,16 @@
""
};
+#ifndef HAVE_STRNLEN
+size_t strnlen(const char *s, size_t maxlen)
+{
+ const char *q = (const char *) memchr(s, '\0', maxlen);
+ if (q == 0)
+ return maxlen;
+ return (size_t) (q - s);
+}
+#endif
+
char *cstrdup(const char *src)
{
return src ? cstrdup(src, strlen(src)) : 0;
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
