summaryrefslogtreecommitdiff
path: root/openbsd-compat
diff options
context:
space:
mode:
Diffstat (limited to 'openbsd-compat')
-rw-r--r--openbsd-compat/Makefile.in4
-rw-r--r--openbsd-compat/inet_aton.c193
-rw-r--r--openbsd-compat/inet_aton.h12
-rw-r--r--openbsd-compat/openbsd-compat.h3
4 files changed, 3 insertions, 209 deletions
diff --git a/openbsd-compat/Makefile.in b/openbsd-compat/Makefile.in
index 564fab2bf..33def5121 100644
--- a/openbsd-compat/Makefile.in
+++ b/openbsd-compat/Makefile.in
@@ -1,4 +1,4 @@
1# $Id: Makefile.in,v 1.13 2001/06/28 23:30:38 mouring Exp $ 1# $Id: Makefile.in,v 1.14 2001/06/29 12:32:32 mouring Exp $
2 2
3sysconfdir=@sysconfdir@ 3sysconfdir=@sysconfdir@
4piddir=@piddir@ 4piddir=@piddir@
@@ -16,7 +16,7 @@ RANLIB=@RANLIB@
16INSTALL=@INSTALL@ 16INSTALL=@INSTALL@
17LDFLAGS=-L. @LDFLAGS@ 17LDFLAGS=-L. @LDFLAGS@
18 18
19OPENBSD=base64.o bindresvport.o daemon.o dirname.o getcwd.o getgrouplist.o glob.o inet_aton.o inet_ntoa.o mktemp.o readpassphrase.o realpath.o rresvport.o setenv.o setproctitle.o sigact.o strlcat.o strlcpy.o strmode.o strsep.o vis.o 19OPENBSD=base64.o bindresvport.o daemon.o dirname.o getcwd.o getgrouplist.o glob.o inet_ntoa.o mktemp.o readpassphrase.o realpath.o rresvport.o setenv.o setproctitle.o sigact.o strlcat.o strlcpy.o strmode.o strsep.o vis.o
20 20
21COMPAT=bsd-arc4random.o bsd-cygwin_util.o bsd-misc.o bsd-nextstep.o bsd-snprintf.o bsd-waitpid.o fake-getaddrinfo.o fake-getnameinfo.o 21COMPAT=bsd-arc4random.o bsd-cygwin_util.o bsd-misc.o bsd-nextstep.o bsd-snprintf.o bsd-waitpid.o fake-getaddrinfo.o fake-getnameinfo.o
22 22
diff --git a/openbsd-compat/inet_aton.c b/openbsd-compat/inet_aton.c
deleted file mode 100644
index 18e31e7f6..000000000
--- a/openbsd-compat/inet_aton.c
+++ /dev/null
@@ -1,193 +0,0 @@
1/* $OpenBSD: inet_addr.c,v 1.6 1999/05/03 22:31:14 yanick Exp $ */
2
3/*
4 * ++Copyright++ 1983, 1990, 1993
5 * -
6 * Copyright (c) 1983, 1990, 1993
7 * The Regents of the University of California. All rights reserved.
8 *
9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions
11 * are met:
12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer.
14 * 2. Redistributions in binary form must reproduce the above copyright
15 * notice, this list of conditions and the following disclaimer in the
16 * documentation and/or other materials provided with the distribution.
17 * 3. All advertising materials mentioning features or use of this software
18 * must display the following acknowledgement:
19 * This product includes software developed by the University of
20 * California, Berkeley and its contributors.
21 * 4. Neither the name of the University nor the names of its contributors
22 * may be used to endorse or promote products derived from this software
23 * without specific prior written permission.
24 *
25 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
26 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
27 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
28 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
29 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
30 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
31 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
32 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
33 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
34 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
35 * SUCH DAMAGE.
36 * -
37 * Portions Copyright (c) 1993 by Digital Equipment Corporation.
38 *
39 * Permission to use, copy, modify, and distribute this software for any
40 * purpose with or without fee is hereby granted, provided that the above
41 * copyright notice and this permission notice appear in all copies, and that
42 * the name of Digital Equipment Corporation not be used in advertising or
43 * publicity pertaining to distribution of the document or software without
44 * specific, written prior permission.
45 *
46 * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
47 * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
48 * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT
49 * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
50 * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
51 * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
52 * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
53 * SOFTWARE.
54 * -
55 * --Copyright--
56 */
57
58#include "config.h"
59
60#if !defined(HAVE_INET_ATON)
61
62#if defined(LIBC_SCCS) && !defined(lint)
63#if 0
64static char sccsid[] = "@(#)inet_addr.c 8.1 (Berkeley) 6/17/93";
65static char rcsid[] = "$From: inet_addr.c,v 8.5 1996/08/05 08:31:35 vixie Exp $";
66#else
67static char rcsid[] = "$OpenBSD: inet_addr.c,v 1.6 1999/05/03 22:31:14 yanick Exp $";
68#endif
69#endif /* LIBC_SCCS and not lint */
70
71#include <sys/types.h>
72#include <sys/param.h>
73#include <netinet/in.h>
74#include <arpa/inet.h>
75#include <ctype.h>
76
77#if 0
78/*
79 * Ascii internet address interpretation routine.
80 * The value returned is in network order.
81 */
82in_addr_t
83inet_addr(cp)
84 register const char *cp;
85{
86 struct in_addr val;
87
88 if (inet_aton(cp, &val))
89 return (val.s_addr);
90 return (INADDR_NONE);
91}
92#endif
93
94/*
95 * Check whether "cp" is a valid ascii representation
96 * of an Internet address and convert to a binary address.
97 * Returns 1 if the address is valid, 0 if not.
98 * This replaces inet_addr, the return value from which
99 * cannot distinguish between failure and a local broadcast address.
100 */
101int
102inet_aton(const char *cp, struct in_addr *addr)
103{
104 register u_int32_t val;
105 register int base, n;
106 register char c;
107 unsigned int parts[4];
108 register unsigned int *pp = parts;
109
110 c = *cp;
111 for (;;) {
112 /*
113 * Collect number up to ``.''.
114 * Values are specified as for C:
115 * 0x=hex, 0=octal, isdigit=decimal.
116 */
117 if (!isdigit(c))
118 return (0);
119 val = 0; base = 10;
120 if (c == '0') {
121 c = *++cp;
122 if (c == 'x' || c == 'X')
123 base = 16, c = *++cp;
124 else
125 base = 8;
126 }
127 for (;;) {
128 if (isascii(c) && isdigit(c)) {
129 val = (val * base) + (c - '0');
130 c = *++cp;
131 } else if (base == 16 && isascii(c) && isxdigit(c)) {
132 val = (val << 4) |
133 (c + 10 - (islower(c) ? 'a' : 'A'));
134 c = *++cp;
135 } else
136 break;
137 }
138 if (c == '.') {
139 /*
140 * Internet format:
141 * a.b.c.d
142 * a.b.c (with c treated as 16 bits)
143 * a.b (with b treated as 24 bits)
144 */
145 if (pp >= parts + 3)
146 return (0);
147 *pp++ = val;
148 c = *++cp;
149 } else
150 break;
151 }
152 /*
153 * Check for trailing characters.
154 */
155 if (c != '\0' && (!isascii(c) || !isspace(c)))
156 return (0);
157 /*
158 * Concoct the address according to
159 * the number of parts specified.
160 */
161 n = pp - parts + 1;
162 switch (n) {
163
164 case 0:
165 return (0); /* initial nondigit */
166
167 case 1: /* a -- 32 bits */
168 break;
169
170 case 2: /* a.b -- 8.24 bits */
171 if ((val > 0xffffff) || (parts[0] > 0xff))
172 return (0);
173 val |= parts[0] << 24;
174 break;
175
176 case 3: /* a.b.c -- 8.8.16 bits */
177 if ((val > 0xffff) || (parts[0] > 0xff) || (parts[1] > 0xff))
178 return (0);
179 val |= (parts[0] << 24) | (parts[1] << 16);
180 break;
181
182 case 4: /* a.b.c.d -- 8.8.8.8 bits */
183 if ((val > 0xff) || (parts[0] > 0xff) || (parts[1] > 0xff) || (parts[2] > 0xff))
184 return (0);
185 val |= (parts[0] << 24) | (parts[1] << 16) | (parts[2] << 8);
186 break;
187 }
188 if (addr)
189 addr->s_addr = htonl(val);
190 return (1);
191}
192
193#endif /* !defined(HAVE_INET_ATON) */
diff --git a/openbsd-compat/inet_aton.h b/openbsd-compat/inet_aton.h
deleted file mode 100644
index aafb7555f..000000000
--- a/openbsd-compat/inet_aton.h
+++ /dev/null
@@ -1,12 +0,0 @@
1/* $Id: inet_aton.h,v 1.2 2001/02/09 01:55:36 djm Exp $ */
2
3#ifndef _BSD_INET_ATON_H
4#define _BSD_INET_ATON_H
5
6#include "config.h"
7
8#ifndef HAVE_INET_ATON
9int inet_aton(const char *cp, struct in_addr *addr);
10#endif /* HAVE_INET_ATON */
11
12#endif /* _BSD_INET_ATON_H */
diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h
index 02e7a57d3..723da7b79 100644
--- a/openbsd-compat/openbsd-compat.h
+++ b/openbsd-compat/openbsd-compat.h
@@ -1,4 +1,4 @@
1/* $Id: openbsd-compat.h,v 1.9 2001/06/28 23:30:38 mouring Exp $ */ 1/* $Id: openbsd-compat.h,v 1.10 2001/06/29 12:32:33 mouring Exp $ */
2 2
3#ifndef _OPENBSD_H 3#ifndef _OPENBSD_H
4#define _OPENBSD_H 4#define _OPENBSD_H
@@ -18,7 +18,6 @@
18#include "dirname.h" 18#include "dirname.h"
19#include "base64.h" 19#include "base64.h"
20#include "sigact.h" 20#include "sigact.h"
21#include "inet_aton.h"
22#include "inet_ntoa.h" 21#include "inet_ntoa.h"
23#include "strsep.h" 22#include "strsep.h"
24#include "vis.h" 23#include "vis.h"
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-01 17:16:54 +0000