Fix portability problem on Solaris 2.5.1.

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index fd06b4ed73abc4389e1aab659a68be294bc36f34..92485dce3389e683ddc00a0c198017f0b390b1fa 100644 (file)
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-11  Bruno Haible  <bruno@clisp.org>
+
+       * vasnprintf.c (local_wcslen): New function, for Solaris 2.5.1.
+       (VASNPRINTF): Use it instead of wcslen.
+
 2003-08-01  Bruno Haible  <bruno@clisp.org>
 
        * relocatable.c (find_shared_library_fullname): Disable the code on

diff --git a/gettext-runtime/intl/vasnprintf.c b/gettext-runtime/intl/vasnprintf.c
index b94297d1e7eefa692038e8740681850da4ff153c..6d2c768fd7e609c2e0616b81eccc4ffff226dc02 100644 (file)
--- a/gettext-runtime/intl/vasnprintf.c
+++ b/gettext-runtime/intl/vasnprintf.c
@@ -58,6 +58,24 @@
 # define freea(p) free (p)
 #endif
 
+#ifdef HAVE_WCHAR_T
+# ifdef HAVE_WCSLEN
+#  define local_wcslen wcslen
+# else
+   /* Solaris 2.5.1 has wcslen() in a separate library libw.so. To avoid
+      a dependency towards this library, here is a local substitute.  */
+static size_t
+local_wcslen (const wchar_t *s)
+{
+  const wchar_t *ptr;
+
+  for (ptr = s; *ptr != (wchar_t) 0; ptr++)
+    ;
+  return ptr - s;
+}
+# endif
+#endif
+
 #if WIDE_CHAR_VERSION
 # define VASNPRINTF vasnwprintf
 # define CHAR_T wchar_t
@@ -399,10 +417,10 @@ VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list ar
                      if (type == TYPE_WIDE_STRING)
 #  if WIDE_CHAR_VERSION
                        tmp_length =
-                         wcslen (a.arg[dp->arg_index].a.a_wide_string);
+                         local_wcslen (a.arg[dp->arg_index].a.a_wide_string);
 #  else
                        tmp_length =
-                         wcslen (a.arg[dp->arg_index].a.a_wide_string)
+                         local_wcslen (a.arg[dp->arg_index].a.a_wide_string)
                          * MB_CUR_MAX;
 #  endif
                      else

diff --git a/gettext-runtime/libasprintf/ChangeLog b/gettext-runtime/libasprintf/ChangeLog
index e2e0943e81904bba25e4037ed4c69fc01a60af45..1dd9226ed8726884a784fc42255b04c17ec248e4 100644 (file)
--- a/gettext-runtime/libasprintf/ChangeLog
+++ b/gettext-runtime/libasprintf/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-11  Bruno Haible  <bruno@clisp.org>
+
+       * vasnprintf.c (local_wcslen): New function, for Solaris 2.5.1.
+       (VASNPRINTF): Use it instead of wcslen.
+
 2003-06-20  Bruno Haible  <bruno@clisp.org>
 
        * configure.ac: Invoke gt_PRINTF_POSIX.

diff --git a/gettext-runtime/libasprintf/vasnprintf.c b/gettext-runtime/libasprintf/vasnprintf.c
index b94297d1e7eefa692038e8740681850da4ff153c..6d2c768fd7e609c2e0616b81eccc4ffff226dc02 100644 (file)
--- a/gettext-runtime/libasprintf/vasnprintf.c
+++ b/gettext-runtime/libasprintf/vasnprintf.c
@@ -58,6 +58,24 @@
 # define freea(p) free (p)
 #endif
 
+#ifdef HAVE_WCHAR_T
+# ifdef HAVE_WCSLEN
+#  define local_wcslen wcslen
+# else
+   /* Solaris 2.5.1 has wcslen() in a separate library libw.so. To avoid
+      a dependency towards this library, here is a local substitute.  */
+static size_t
+local_wcslen (const wchar_t *s)
+{
+  const wchar_t *ptr;
+
+  for (ptr = s; *ptr != (wchar_t) 0; ptr++)
+    ;
+  return ptr - s;
+}
+# endif
+#endif
+
 #if WIDE_CHAR_VERSION
 # define VASNPRINTF vasnwprintf
 # define CHAR_T wchar_t
@@ -399,10 +417,10 @@ VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list ar
                      if (type == TYPE_WIDE_STRING)
 #  if WIDE_CHAR_VERSION
                        tmp_length =
-                         wcslen (a.arg[dp->arg_index].a.a_wide_string);
+                         local_wcslen (a.arg[dp->arg_index].a.a_wide_string);
 #  else
                        tmp_length =
-                         wcslen (a.arg[dp->arg_index].a.a_wide_string)
+                         local_wcslen (a.arg[dp->arg_index].a.a_wide_string)
                          * MB_CUR_MAX;
 #  endif
                      else