Check that strlcpy behaves as per the OpenBSD man page before wrapping it.

	* configure.in: Check that strlcpy behaves as per the OpenBSD
	man page before wrapping it.  (#53933)

8 files changed, 43 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 7268578db..29a638f37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-03  Matthias Clasen  <maclas@gmx.de>
+
+	* configure.in: Check that strlcpy behaves as per the OpenBSD 
+	man page before wrapping it.  (#53933)
+
 2002-12-03  Frederic Crozat  <fcrozat@mandrakesoft.com>
 
 	* glib/gunicollate.c: (g_utf8_collate_key):
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7268578db..29a638f37 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2002-12-03  Matthias Clasen  <maclas@gmx.de>
+
+	* configure.in: Check that strlcpy behaves as per the OpenBSD 
+	man page before wrapping it.  (#53933)
+
 2002-12-03  Frederic Crozat  <fcrozat@mandrakesoft.com>
 
 	* glib/gunicollate.c: (g_utf8_collate_key):
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 7268578db..29a638f37 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2002-12-03  Matthias Clasen  <maclas@gmx.de>
+
+	* configure.in: Check that strlcpy behaves as per the OpenBSD 
+	man page before wrapping it.  (#53933)
+
 2002-12-03  Frederic Crozat  <fcrozat@mandrakesoft.com>
 
 	* glib/gunicollate.c: (g_utf8_collate_key):
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 7268578db..29a638f37 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2002-12-03  Matthias Clasen  <maclas@gmx.de>
+
+	* configure.in: Check that strlcpy behaves as per the OpenBSD 
+	man page before wrapping it.  (#53933)
+
 2002-12-03  Frederic Crozat  <fcrozat@mandrakesoft.com>
 
 	* glib/gunicollate.c: (g_utf8_collate_key):
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 7268578db..29a638f37 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2002-12-03  Matthias Clasen  <maclas@gmx.de>
+
+	* configure.in: Check that strlcpy behaves as per the OpenBSD 
+	man page before wrapping it.  (#53933)
+
 2002-12-03  Frederic Crozat  <fcrozat@mandrakesoft.com>
 
 	* glib/gunicollate.c: (g_utf8_collate_key):
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 7268578db..29a638f37 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2002-12-03  Matthias Clasen  <maclas@gmx.de>
+
+	* configure.in: Check that strlcpy behaves as per the OpenBSD 
+	man page before wrapping it.  (#53933)
+
 2002-12-03  Frederic Crozat  <fcrozat@mandrakesoft.com>
 
 	* glib/gunicollate.c: (g_utf8_collate_key):
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 7268578db..29a638f37 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2002-12-03  Matthias Clasen  <maclas@gmx.de>
+
+	* configure.in: Check that strlcpy behaves as per the OpenBSD 
+	man page before wrapping it.  (#53933)
+
 2002-12-03  Frederic Crozat  <fcrozat@mandrakesoft.com>
 
 	* glib/gunicollate.c: (g_utf8_collate_key):
diff --git a/configure.in b/configure.in
index 30a295af6..82b304394 100644
--- a/configure.in
+++ b/configure.in
@@ -844,18 +844,19 @@ dnl ****************************************
 dnl *** strlcpy/strlcat                  ***
 dnl ****************************************
 # Check for strlcpy
-AC_MSG_CHECKING(for OpenBSD strlcpy/strlcat)
-AC_TRY_RUN([
+AC_CACHE_CHECK([for OpenBSD strlcpy/strlcat],glib_cv_have_strlcpy,[
+AC_TRY_RUN([#include <stdlib.h>
 #include <string.h>
 int main() {
-  char *p = malloc (10);
+  char p[10];
   (void) strlcpy (p, "hi", 10);
   if (strlcat (p, "bye", 0) != 3) 
-    exit (1);
+    return 1;
   return 0;
-}], glib_ok=yes, glib_ok=no)
-AC_MSG_RESULT($glib_ok)
-if test "$glib_ok" = "yes"; then
+}], glib_cv_have_strlcpy=yes, 
+    glib_cv_have_strlcpy=no,
+    glib_cv_have_strlcpy=no)])
+if test "$glib_cv_have_strlcpy" = "yes"; then
     AC_DEFINE(HAVE_STRLCPY,1,[Have functions strlcpy and strlcat])
 fi