projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(INCLUDES): Remove -I../intl.
[gnulib.git]
/
lib
/
strnlen.c
diff --git
a/lib/strnlen.c
b/lib/strnlen.c
index
dd22db9
..
b6c7102
100644
(file)
--- a/
lib/strnlen.c
+++ b/
lib/strnlen.c
@@
-1,5
+1,5
@@
/* Find the length of STRING, but scan at most MAXLEN characters.
/* 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
-2002
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
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,22
@@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
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
+
+#if HAVE_STRING_H
+# if !STDC_HEADERS && HAVE_MEMORY_H
+# include <memory.h>
+# endif
+/* Temporarily redefine strnlen so that an inconsistent prototype
+ (on at least AIX4.3.2.0 w/gcc-2.95.3) doesn't cause trouble. */
+# define strnlen system_strnlen
+# include <string.h>
+# undef strnlen
+#else
+# include <strings.h>
+#endif
#ifndef HAVE_DECL_MEMCHR
"this configure-time declaration test was not run"
#ifndef HAVE_DECL_MEMCHR
"this configure-time declaration test was not run"
@@
-40,7
+55,7
@@
size_t
__strnlen (const char *string, size_t maxlen)
{
const char *end = memchr (string, '\0', maxlen);
__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)
}
#ifdef weak_alias
weak_alias (__strnlen, strnlen)