diff options
author | Ludovic Courtès <ludo@gnu.org> | 2009-11-15 20:50:08 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2009-11-16 09:23:47 +0100 |
commit | 3452e6667f9c9a83004a38ed146d26aed8c17754 (patch) | |
tree | c70e3f92dc4d2d1ec3cc979c65a9443335378e51 /libguile/inet_aton.c | |
parent | 8912421cf3829a4fd65877fd1255125c191f6f89 (diff) | |
download | guile-3452e6667f9c9a83004a38ed146d26aed8c17754.tar.gz |
Deprecate `inet-ntoa' and `inet-aton'.
Suggested by Bruno Haible.
* libguile/inet_aton.c: Remove.
* libguile/Makefile.am (EXTRA_libguile_la_SOURCES): Remove
`inet_aton.c'.
* libguile/deprecated.c (scm_inet_aton, scm_inet_ntoa): New functions.
* libguile/deprecated.h: Update accordingly.
* libguile/socket.c (scm_inet_aton, scm_inet_ntoa): Remove.
* doc/ref/posix.texi (Network Address Conversion): Mark `inet-ntoa' and
`inet-aton' as deprecated.
Diffstat (limited to 'libguile/inet_aton.c')
-rw-r--r-- | libguile/inet_aton.c | 174 |
1 files changed, 0 insertions, 174 deletions
diff --git a/libguile/inet_aton.c b/libguile/inet_aton.c deleted file mode 100644 index c89378bb1..000000000 --- a/libguile/inet_aton.c +++ /dev/null @@ -1,174 +0,0 @@ -/* - * Copyright (c) 1983, 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - -#if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)inet_addr.c 8.1 (Berkeley) 6/17/93"; -#endif /* LIBC_SCCS and not lint */ - -#include <ctype.h> - -#ifdef __MINGW32__ -/* Include for MinGW only. Cygwin will have the latter. */ -#include <winsock2.h> -#else -#include <sys/param.h> -#include <netinet/in.h> -#include <arpa/inet.h> -#endif - -#if 0 - -/* - * Ascii internet address interpretation routine. - * The value returned is in network order. - */ -u_long -inet_addr(const char *cp) -{ - struct in_addr val; - - if (inet_aton(cp, &val)) - return (val.s_addr); - return (INADDR_NONE); -} - -#endif - -/* We provide this prototype to avoid compiler warnings. If this ever - conflicts with a declaration in a system header file, we'll find - out, because we should include that header file here. */ -int inet_aton (const char *cp, struct in_addr *addr); - -/* - * Check whether "cp" is a valid ascii representation - * of an Internet address and convert to a binary address. - * Returns 1 if the address is valid, 0 if not. - * This replaces inet_addr, the return value from which - * cannot distinguish between failure and a local broadcast address. */ -int -inet_aton(const char *cp_arg, struct in_addr *addr) -{ - register unsigned long val; - register int base, n; - register unsigned char c; - register unsigned const char *cp = (unsigned const char *) cp_arg; - unsigned int parts[4]; - register unsigned int *pp = parts; - - for (;;) { - /* - * Collect number up to ``.''. - * Values are specified as for C: - * 0x=hex, 0=octal, other=decimal. - */ - val = 0; base = 10; - if (*cp == '0') { - if (*++cp == 'x' || *cp == 'X') - base = 16, cp++; - else - base = 8; - } - while ((c = *cp) != '\0') { - if (isascii ((int) c) && isdigit ((int) c)) { - val = (val * base) + (c - '0'); - cp++; - continue; - } - if (base == 16 && isascii ((int) c) && isxdigit ((int) c)) { - val = (val << 4) + - (c + 10 - (islower((int) c) ? 'a' : 'A')); - cp++; - continue; - } - break; - } - if (*cp == '.') { - /* - * Internet format: - * a.b.c.d - * a.b.c (with c treated as 16-bits) - * a.b (with b treated as 24 bits) - */ - if (pp >= parts + 3 || val > 0xff) - return (0); - *pp++ = val, cp++; - } else - break; - } - /* - * Check for trailing characters. - */ - if (*cp && (!isascii ((int) (*cp)) || !isspace ((int) (*cp)))) - return (0); - /* - * Concoct the address according to - * the number of parts specified. - */ - n = pp - parts + 1; - switch (n) { - - case 1: /* a -- 32 bits */ - break; - - case 2: /* a.b -- 8.24 bits */ - if (val > 0xffffff) - return (0); - val |= parts[0] << 24; - break; - - case 3: /* a.b.c -- 8.8.16 bits */ - if (val > 0xffff) - return (0); - val |= (parts[0] << 24) | (parts[1] << 16); - break; - - case 4: /* a.b.c.d -- 8.8.8.8 bits */ - if (val > 0xff) - return (0); - val |= (parts[0] << 24) | (parts[1] << 16) | (parts[2] << 8); - break; - } - if (addr) - addr->s_addr = htonl(val); - return (1); -} - -/* - Local Variables: - c-file-style: "gnu" - End: -*/ |