projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Check that memchr does not read past the first occurrence of the byte.
[gnulib.git]
/
lib
/
inet_pton.c
diff --git
a/lib/inet_pton.c
b/lib/inet_pton.c
index
f2b58bb
..
62ef145
100644
(file)
--- a/
lib/inet_pton.c
+++ b/
lib/inet_pton.c
@@
-1,10
+1,11
@@
/* inet_pton.c -- convert IPv4 and IPv6 addresses from text to binary form
/* inet_pton.c -- convert IPv4 and IPv6 addresses from text to binary form
- Copyright (c) 2006 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ Copyright (C) 2006, 2008 Free Software Foundation, Inc.
+
+ This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version
2, or (at your option)
- any later version.
+ the Free Software Foundation; either version
3 of the License, or
+
(at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-12,8
+13,7
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
/*
* Copyright (c) 1996,1999 by Internet Software Consortium.
/*
* Copyright (c) 1996,1999 by Internet Software Consortium.
@@
-32,14
+32,12
@@
* SOFTWARE.
*/
* SOFTWARE.
*/
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
/* Specification. */
/* Specification. */
-#include
"inet_pton.h"
+#include
<arpa/inet.h>
-#include <ctype.h>
+#include <c
-c
type.h>
#include <string.h>
#include <errno.h>
#include <string.h>
#include <errno.h>
@@
-80,7
+78,7
@@
inet_pton (int af, const char *restrict src, void *restrict dst)
case AF_INET:
return (inet_pton4 (src, dst));
case AF_INET:
return (inet_pton4 (src, dst));
-#if HAVE_IPV
4
+#if HAVE_IPV
6
case AF_INET6:
return (inet_pton6 (src, dst));
#endif
case AF_INET6:
return (inet_pton6 (src, dst));
#endif
@@
-181,7
+179,7
@@
inet_pton6 (const char *restrict src, unsigned char *restrict dst)
curtok = src;
saw_xdigit = 0;
val = 0;
curtok = src;
saw_xdigit = 0;
val = 0;
- while ((ch = tolower (*src++)) != '\0')
+ while ((ch =
c_
tolower (*src++)) != '\0')
{
const char *pch;
{
const char *pch;