add support for wxStrnlen for those platforms where it's available

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58060 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure b/configure
index c9d2107535e829f71e9e007c144e5c6eb54d30f3..a96ef63669262dc3da329645be4747b3103945ae 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
 #! /bin/sh

-# From configure.in Id: configure.in 58009 2009-01-11 00:57:08Z VZ .
+# From configure.in Id: configure.in 58039 2009-01-12 14:26:13Z VZ .

 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
 #
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
 #


@@ -35045,6 +35045,100 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 

+fi
+done
+
+
+for ac_func in strnlen
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
+int
+main ()
+{
+return $ac_func ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_c_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       eval "$as_ac_var=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval echo '${'$as_ac_var'}'`
+              { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+

 fi
 done
 
 fi
 done
 

diff --git a/configure.in b/configure.in
index 5ffa04ee88cf757ae3e253df57da2f3f277be874..87ce064dc27543e04a236660eb561ffe79fb97c2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4048,6 +4048,7 @@ if test "$wxUSE_WCHAR_T" = "yes"; then
     fi
 
     AC_CHECK_FUNCS([wcsdup])
     fi
 
     AC_CHECK_FUNCS([wcsdup])

+    AC_CHECK_FUNCS([strnlen])

 
     dnl On HP-UX aCC need this define to find mbstrtowcs() &c
     dnl Can't be used for g++ since the mbstate_t in wchar.h can conflict
 
     dnl On HP-UX aCC need this define to find mbstrtowcs() &c
     dnl Can't be used for g++ since the mbstate_t in wchar.h can conflict

diff --git a/include/wx/wxcrt.h b/include/wx/wxcrt.h
index a0887da4aeb52ef681e1b3dee41afe2ac3d15ebf..ca5c694e667a3628dcc3235c7da77e41de371db5 100644 (file)
--- a/include/wx/wxcrt.h
+++ b/include/wx/wxcrt.h
@@ -181,6 +181,17 @@ inline size_t wxStrlen(const wxWCharBuffer& s) { return wxStrlen(s.data()); }
 inline size_t wxStrlen(const wxString& s) { return s.length(); }
 inline size_t wxStrlen(const wxCStrData& s) { return s.AsString().length(); }
 
 inline size_t wxStrlen(const wxString& s) { return s.length(); }
 inline size_t wxStrlen(const wxCStrData& s) { return s.AsString().length(); }
 

+// this is a function new in 2.9 so we don't care about backwards compatibility and
+// so don't need to support wchar_t/char overloads
+#if defined(wxCRT_StrnlenA) && defined(wxCRT_StrnlenW)
+inline size_t wxStrnlen(const char *str, size_t maxlen) { return wxCRT_StrnlenA(str, maxlen); }
+inline size_t wxStrnlen(const wchar_t *str, size_t maxlen) { return wxCRT_StrnlenW(str, maxlen); }
+#else
+// use unsafer wxStrlen:
+inline size_t wxStrnlen(const char *str, size_t maxlen) { return wxCRT_StrlenA(str); wxUnusedVar(maxlen); }
+inline size_t wxStrnlen(const wchar_t *str, size_t maxlen) { return wxCRT_StrlenW(str); wxUnusedVar(maxlen); }
+#endif
+

 // NB: these are defined in wxcrtbase.h, see the comment there
 // inline char* wxStrdup(const char *s) { return wxStrdupA(s); }
 // inline wchar_t* wxStrdup(const wchar_t *s) { return wxStrdupW(s); }
 // NB: these are defined in wxcrtbase.h, see the comment there
 // inline char* wxStrdup(const char *s) { return wxStrdupA(s); }
 // inline wchar_t* wxStrdup(const wchar_t *s) { return wxStrdupW(s); }


@@ -231,7 +242,7 @@ inline char *wxStrncpy(char *dest, const wchar_t *src, size_t n)
 inline wchar_t *wxStrncpy(wchar_t *dest, const char *src, size_t n)
     { return wxCRT_StrncpyW(dest, wxConvLibc.cMB2WC(src), n); }
 
 inline wchar_t *wxStrncpy(wchar_t *dest, const char *src, size_t n)
     { return wxCRT_StrncpyW(dest, wxConvLibc.cMB2WC(src), n); }
 

-// this is a new function so we don't care about backwards compatibility and
+// this is a function new in 2.9 so we don't care about backwards compatibility and

 // so don't need to support wchar_t/char overloads
 inline size_t wxStrlcpy(char *dest, const char *src, size_t n)
 {
 // so don't need to support wchar_t/char overloads
 inline size_t wxStrlcpy(char *dest, const char *src, size_t n)
 {

diff --git a/include/wx/wxcrtbase.h b/include/wx/wxcrtbase.h
index 0f5f16d2e71e09f9cfdc170c65d72603fcca2124..45cb175d698a94999390099efe8482ffd29f31ec 100644 (file)
--- a/include/wx/wxcrtbase.h
+++ b/include/wx/wxcrtbase.h
@@ -222,6 +222,11 @@ WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size );
     #endif /* HAVE_WCSTOULL */
 #endif
 
     #endif /* HAVE_WCSTOULL */
 #endif
 

+/* Not all compilers have strnlen(); e.g. MSVC 6.x and 7.x don't have it */
+#if wxCHECK_VISUALC_VERSION(8) || defined(HAVE_STRNLEN)
+    #define wxCRT_StrnlenA  strnlen
+    #define wxCRT_StrnlenW  wcsnlen
+#endif

 
 /* define wxCRT_StricmpA/W and wxCRT_StrnicmpA/W for various compilers */
 
 
 /* define wxCRT_StricmpA/W and wxCRT_StrnicmpA/W for various compilers */
 

diff --git a/setup.h.in b/setup.h.in
index ddc48e735aef05ad3c6b551ca89f0964f1fd160c..39369fadf1afb6cfba7666ac2fcbd1f8a3e2f996 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -918,6 +918,9 @@
 /* Define if you have wcsdup function  */
 #undef HAVE_WCSDUP
 
 /* Define if you have wcsdup function  */
 #undef HAVE_WCSDUP
 

+/* Define if you have strnlen() function */
+#undef HAVE_STRNLEN
+

 /* Define if you have wcstoull() and wcstoll() */
 #undef HAVE_WCSTOULL
 
 /* Define if you have wcstoull() and wcstoll() */
 #undef HAVE_WCSTOULL