X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fstrnlen.c;h=e7ad6d2f0662ea73720ddd7e2832b4a4499f26e0;hb=a76a349e949dfad5716eb3893052070b770e949f;hp=dd22db92e6c14fb2ff4e3aa2d73cc9b056c72570;hpb=85b73e4b0a5e874f93751eb6f4f7ace166d5f5fb;p=gnulib.git

diff --git a/lib/strnlen.c b/lib/strnlen.c
index dd22db92e..e7ad6d2f0 100644
--- a/lib/strnlen.c
+++ b/lib/strnlen.c
@@ -1,5 +1,5 @@
 /* Find the length of STRING, but scan at most MAXLEN characters.
-   Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 2000-2003 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -17,7 +17,19 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include <string.h>
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+#undef strnlen
+
+#if HAVE_STRING_H
+# if !STDC_HEADERS && HAVE_MEMORY_H
+#  include <memory.h>
+# endif
+# include <string.h>
+#else
+# include <strings.h>
+#endif
 
 #ifndef HAVE_DECL_MEMCHR
 "this configure-time declaration test was not run"
@@ -29,6 +41,10 @@ char *memchr ();
 #undef __strnlen
 #undef strnlen
 
+#ifndef _LIBC
+# define strnlen rpl_strnlen
+#endif
+
 #ifndef weak_alias
 # define __strnlen strnlen
 #endif
@@ -40,7 +56,7 @@ size_t
 __strnlen (const char *string, size_t maxlen)
 {
   const char *end = memchr (string, '\0', maxlen);
-  return end ? end - string : maxlen;
+  return end ? (size_t) (end - string) : maxlen;
 }
 #ifdef weak_alias
 weak_alias (__strnlen, strnlen)