mirror of
				https://sourceware.org/git/glibc.git
				synced 2025-10-30 10:45:40 +03:00 
			
		
		
		
	1997-11-06 00:06 Ulrich Drepper <drepper@cygnus.com> * argp/argp-help.c: Optimize a bit by using mempcpy. * elf/dl-load.c: Likewise. * elf/dl-lookup.c: Likewise. * inet/rcmd.c: Likewise. * io/ftw.c: Likewise. * libio/fileops.c: Likewise. * libio/genops.c: Likewise. * libio/obprintf.c: Likewise. * nss/nsswitch.c: Likewise. * posix/execvp.c: Likewise. * posix/getopt.c: Likewise. * posix/glob.c: Likewise. * posix/wordexp.c: Likewise. * stdio-common/vfprintf.c: Likewise. * stdlib/canonicalize.c: Likewise. * stdlib/msort.c: Likewise. * string/argz-replace.c: Likewise. * sysdeps/generic/putenv.c: Likewise. * sysdeps/generic/setenv.c: Likewise. * sysdeps/posix/getcwd.c: Likewise. * sysdeps/posix/ttyname.c: Likewise. * sysdeps/posix/writev.c: Likewise. * time/strftime.c: Likewise. * time/tzfile.c: Likewise. * login/utmp_daemon.c: Use memcpy instead of strcpy where possible. * sunrpc/svcauth_des.c: Likewise. * sysdeps/unix/sysv/linux/gethostname.c: Likewise. * misc/tsearch.c: Use memcpy return value if possible. * posix/regex.c: Likewise. * sysdeps/unix/readdir_r.c: Likewise. * wcsmbc/wcsdup.c: Likewise. * nss/digits_dots.c: Little optimization. * inet/ruserpass.c (ruserpass): Optimize by using stpcpy. (struct toktab): Make tokstr field a const char *. * elf/dl-profile.c: Fix typo. * inet/ether_ntoh.c: Don't use relative #include path. * inet/gethstbynm.c: Likewise. * resolv/inet_pton.c: Likewise. * shadow/sgetspent_r.c: Likewise. * libio/oldfileops.c (_IO_old_file_jumps): Use correct sync and write callbacks. Patch by NIIBE Yutaka <gniibe@mri.co.jp>. * posix/confstr.c: Correct string for _CS_LFS_CFLAGS. Handle _CS_XBS5_* constants. * posix/unistd.h: Add comment describing _XBS5_* constants. * sysdeps/generic/bits/confname.h: Add _CS_XBS5_* constants. * posix/regex.c: Indent preprocessor code. * posix/wordexp.c: Using _itoa_word instead of sprintf. * stdlib/canonicalize.c: Avoid unnecessary copying. Handle NULL and "" arguments correctly according to SUS. * stdlib/test-canon.c: Test "" and NULL argument handling. * sysdeps/posix/writev.c: Correct condition to leave the loop. 1997-11-05 18:13 Ulrich Drepper <drepper@cygnus.com> * nss/getXXbyYY.c: Set buffer to NULL if realloc fails so that possible next call starts with malloc again. Proposed by Joe Keane <jgk@jgk.org>. 1997-11-04 23:57 Ulrich Drepper <drepper@cygnus.com> * configure.in: Correct gcc -pipe test. Patch by Zack Weinberg <zack@rabi.phys.columbia.edu>. * posix/glob.c: Cleanups. Patch by H.J. Lu <hjl@lucon.org>. 1997-11-04 Andreas Jaeger <aj@arthur.rhein-neckar.de> * manual/creature.texi (Feature Test Macros): Add _POSIX_C_SOURCE definition.
		
			
				
	
	
		
			218 lines
		
	
	
		
			5.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			218 lines
		
	
	
		
			5.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /* Copyright (c) 1996 by Internet Software Consortium.
 | |
|  *
 | |
|  * Permission to use, copy, modify, and distribute this software for any
 | |
|  * purpose with or without fee is hereby granted, provided that the above
 | |
|  * copyright notice and this permission notice appear in all copies.
 | |
|  *
 | |
|  * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
 | |
|  * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
 | |
|  * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
 | |
|  * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
 | |
|  * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
 | |
|  * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
 | |
|  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 | |
|  * SOFTWARE.
 | |
|  */
 | |
| 
 | |
| #if defined(LIBC_SCCS) && !defined(lint)
 | |
| static char rcsid[] = "$Id$";
 | |
| #endif /* LIBC_SCCS and not lint */
 | |
| 
 | |
| #include <sys/param.h>
 | |
| #include <sys/types.h>
 | |
| #include <sys/socket.h>
 | |
| #include <netinet/in.h>
 | |
| #include <arpa/inet.h>
 | |
| #include <arpa/nameser.h>
 | |
| #include <string.h>
 | |
| #include <errno.h>
 | |
| #include <conf/portability.h>
 | |
| 
 | |
| /*
 | |
|  * WARNING: Don't even consider trying to compile this on a system where
 | |
|  * sizeof(int) < 4.  sizeof(int) > 4 is fine; all the world's not a VAX.
 | |
|  */
 | |
| 
 | |
| static int inet_pton4 __P((const char *src, u_char *dst)) internal_function;
 | |
| static int inet_pton6 __P((const char *src, u_char *dst)) internal_function;
 | |
| 
 | |
| /* int
 | |
|  * inet_pton(af, src, dst)
 | |
|  *	convert from presentation format (which usually means ASCII printable)
 | |
|  *	to network format (which is usually some kind of binary format).
 | |
|  * return:
 | |
|  *	1 if the address was valid for the specified address family
 | |
|  *	0 if the address wasn't valid (`dst' is untouched in this case)
 | |
|  *	-1 if some other error occurred (`dst' is untouched in this case, too)
 | |
|  * author:
 | |
|  *	Paul Vixie, 1996.
 | |
|  */
 | |
| int
 | |
| inet_pton(af, src, dst)
 | |
| 	int af;
 | |
| 	const char *src;
 | |
| 	void *dst;
 | |
| {
 | |
| 	switch (af) {
 | |
| 	case AF_INET:
 | |
| 		return (inet_pton4(src, dst));
 | |
| 	case AF_INET6:
 | |
| 		return (inet_pton6(src, dst));
 | |
| 	default:
 | |
| 		__set_errno (EAFNOSUPPORT);
 | |
| 		return (-1);
 | |
| 	}
 | |
| 	/* NOTREACHED */
 | |
| }
 | |
| 
 | |
| /* int
 | |
|  * inet_pton4(src, dst)
 | |
|  *	like inet_aton() but without all the hexadecimal and shorthand.
 | |
|  * return:
 | |
|  *	1 if `src' is a valid dotted quad, else 0.
 | |
|  * notice:
 | |
|  *	does not touch `dst' unless it's returning 1.
 | |
|  * author:
 | |
|  *	Paul Vixie, 1996.
 | |
|  */
 | |
| static int
 | |
| internal_function
 | |
| inet_pton4(src, dst)
 | |
| 	const char *src;
 | |
| 	u_char *dst;
 | |
| {
 | |
| 	static const char digits[] = "0123456789";
 | |
| 	int saw_digit, octets, ch;
 | |
| 	u_char tmp[INADDRSZ], *tp;
 | |
| 
 | |
| 	saw_digit = 0;
 | |
| 	octets = 0;
 | |
| 	*(tp = tmp) = 0;
 | |
| 	while ((ch = *src++) != '\0') {
 | |
| 		const char *pch;
 | |
| 
 | |
| 		if ((pch = strchr(digits, ch)) != NULL) {
 | |
| 			u_int new = *tp * 10 + (pch - digits);
 | |
| 
 | |
| 			if (new > 255)
 | |
| 				return (0);
 | |
| 			*tp = new;
 | |
| 			if (! saw_digit) {
 | |
| 				if (++octets > 4)
 | |
| 					return (0);
 | |
| 				saw_digit = 1;
 | |
| 			}
 | |
| 		} else if (ch == '.' && saw_digit) {
 | |
| 			if (octets == 4)
 | |
| 				return (0);
 | |
| 			*++tp = 0;
 | |
| 			saw_digit = 0;
 | |
| 		} else
 | |
| 			return (0);
 | |
| 	}
 | |
| 	if (octets < 4)
 | |
| 		return (0);
 | |
| 
 | |
| 	memcpy(dst, tmp, INADDRSZ);
 | |
| 	return (1);
 | |
| }
 | |
| 
 | |
| /* int
 | |
|  * inet_pton6(src, dst)
 | |
|  *	convert presentation level address to network order binary form.
 | |
|  * return:
 | |
|  *	1 if `src' is a valid [RFC1884 2.2] address, else 0.
 | |
|  * notice:
 | |
|  *	(1) does not touch `dst' unless it's returning 1.
 | |
|  *	(2) :: in a full address is silently ignored.
 | |
|  * credit:
 | |
|  *	inspired by Mark Andrews.
 | |
|  * author:
 | |
|  *	Paul Vixie, 1996.
 | |
|  */
 | |
| static int
 | |
| internal_function
 | |
| inet_pton6(src, dst)
 | |
| 	const char *src;
 | |
| 	u_char *dst;
 | |
| {
 | |
| 	static const char xdigits_l[] = "0123456789abcdef",
 | |
| 			  xdigits_u[] = "0123456789ABCDEF";
 | |
| 	u_char tmp[IN6ADDRSZ], *tp, *endp, *colonp;
 | |
| 	const char *xdigits, *curtok;
 | |
| 	int ch, saw_xdigit;
 | |
| 	u_int val;
 | |
| 
 | |
| 	memset((tp = tmp), '\0', IN6ADDRSZ);
 | |
| 	endp = tp + IN6ADDRSZ;
 | |
| 	colonp = NULL;
 | |
| 	/* Leading :: requires some special handling. */
 | |
| 	if (*src == ':')
 | |
| 		if (*++src != ':')
 | |
| 			return (0);
 | |
| 	curtok = src;
 | |
| 	saw_xdigit = 0;
 | |
| 	val = 0;
 | |
| 	while ((ch = *src++) != '\0') {
 | |
| 		const char *pch;
 | |
| 
 | |
| 		if ((pch = strchr((xdigits = xdigits_l), ch)) == NULL)
 | |
| 			pch = strchr((xdigits = xdigits_u), ch);
 | |
| 		if (pch != NULL) {
 | |
| 			val <<= 4;
 | |
| 			val |= (pch - xdigits);
 | |
| 			if (val > 0xffff)
 | |
| 				return (0);
 | |
| 			saw_xdigit = 1;
 | |
| 			continue;
 | |
| 		}
 | |
| 		if (ch == ':') {
 | |
| 			curtok = src;
 | |
| 			if (!saw_xdigit) {
 | |
| 				if (colonp)
 | |
| 					return (0);
 | |
| 				colonp = tp;
 | |
| 				continue;
 | |
| 			}
 | |
| 			if (tp + INT16SZ > endp)
 | |
| 				return (0);
 | |
| 			*tp++ = (u_char) (val >> 8) & 0xff;
 | |
| 			*tp++ = (u_char) val & 0xff;
 | |
| 			saw_xdigit = 0;
 | |
| 			val = 0;
 | |
| 			continue;
 | |
| 		}
 | |
| 		if (ch == '.' && ((tp + INADDRSZ) <= endp) &&
 | |
| 		    inet_pton4(curtok, tp) > 0) {
 | |
| 			tp += INADDRSZ;
 | |
| 			saw_xdigit = 0;
 | |
| 			break;	/* '\0' was seen by inet_pton4(). */
 | |
| 		}
 | |
| 		return (0);
 | |
| 	}
 | |
| 	if (saw_xdigit) {
 | |
| 		if (tp + INT16SZ > endp)
 | |
| 			return (0);
 | |
| 		*tp++ = (u_char) (val >> 8) & 0xff;
 | |
| 		*tp++ = (u_char) val & 0xff;
 | |
| 	}
 | |
| 	if (colonp != NULL) {
 | |
| 		/*
 | |
| 		 * Since some memmove()'s erroneously fail to handle
 | |
| 		 * overlapping regions, we'll do the shift by hand.
 | |
| 		 */
 | |
| 		const int n = tp - colonp;
 | |
| 		int i;
 | |
| 
 | |
| 		for (i = 1; i <= n; i++) {
 | |
| 			endp[- i] = colonp[n - i];
 | |
| 			colonp[n - i] = 0;
 | |
| 		}
 | |
| 		tp = endp;
 | |
| 	}
 | |
| 	if (tp != endp)
 | |
| 		return (0);
 | |
| 	memcpy(dst, tmp, IN6ADDRSZ);
 | |
| 	return (1);
 | |
| }
 |