summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--openbsd-compat/inet_aton.c24
2 files changed, 9 insertions, 18 deletions
diff --git a/ChangeLog b/ChangeLog
index a274ce3ba..120f68f84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,6 +32,7 @@
32 - (dtucker) [openbsd-compat/getcwd.c] Update from OpenBSD 1.9 -> 1.14. 32 - (dtucker) [openbsd-compat/getcwd.c] Update from OpenBSD 1.9 -> 1.14.
33 - (dtucker) [openbsd-compat/getcwd.c] Replace lstat with fstat to match up 33 - (dtucker) [openbsd-compat/getcwd.c] Replace lstat with fstat to match up
34 with OpenBSD code since we don't support platforms without fstat any more. 34 with OpenBSD code since we don't support platforms without fstat any more.
35 - (dtucker) [openbsd-compat/inet_aton.c] Update from OpenBSD 1.7 -> 1.9.
35 36
3620051105 3720051105
37 - (djm) OpenBSD CVS Sync 38 - (djm) OpenBSD CVS Sync
@@ -3274,4 +3275,4 @@
3274 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3275 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3275 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3276 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3276 3277
3277$Id: ChangeLog,v 1.3974 2005/11/10 06:15:06 dtucker Exp $ 3278$Id: ChangeLog,v 1.3975 2005/11/10 06:21:21 dtucker Exp $
diff --git a/openbsd-compat/inet_aton.c b/openbsd-compat/inet_aton.c
index 355bf6bc9..130597e14 100644
--- a/openbsd-compat/inet_aton.c
+++ b/openbsd-compat/inet_aton.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: inet_addr.c,v 1.7 2003/06/02 20:18:35 millert Exp $ */ 1/* $OpenBSD: inet_addr.c,v 1.9 2005/08/06 20:30:03 espie Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1983, 1990, 1993 4 * Copyright (c) 1983, 1990, 1993
@@ -55,15 +55,6 @@
55 55
56#if !defined(HAVE_INET_ATON) 56#if !defined(HAVE_INET_ATON)
57 57
58#if defined(LIBC_SCCS) && !defined(lint)
59#if 0
60static char sccsid[] = "@(#)inet_addr.c 8.1 (Berkeley) 6/17/93";
61static char rcsid[] = "$From: inet_addr.c,v 8.5 1996/08/05 08:31:35 vixie Exp $";
62#else
63static char rcsid[] = "$OpenBSD: inet_addr.c,v 1.7 2003/06/02 20:18:35 millert Exp $";
64#endif
65#endif /* LIBC_SCCS and not lint */
66
67#include <sys/types.h> 58#include <sys/types.h>
68#include <sys/param.h> 59#include <sys/param.h>
69#include <netinet/in.h> 60#include <netinet/in.h>
@@ -76,8 +67,7 @@ static char rcsid[] = "$OpenBSD: inet_addr.c,v 1.7 2003/06/02 20:18:35 millert E
76 * The value returned is in network order. 67 * The value returned is in network order.
77 */ 68 */
78in_addr_t 69in_addr_t
79inet_addr(cp) 70inet_addr(const char *cp)
80 register const char *cp;
81{ 71{
82 struct in_addr val; 72 struct in_addr val;
83 73
@@ -97,11 +87,11 @@ inet_addr(cp)
97int 87int
98inet_aton(const char *cp, struct in_addr *addr) 88inet_aton(const char *cp, struct in_addr *addr)
99{ 89{
100 register u_int32_t val; 90 u_int32_t val;
101 register int base, n; 91 int base, n;
102 register char c; 92 char c;
103 unsigned int parts[4]; 93 u_int parts[4];
104 register unsigned int *pp = parts; 94 u_int *pp = parts;
105 95
106 c = *cp; 96 c = *cp;
107 for (;;) { 97 for (;;) {