mirror of
				https://sourceware.org/git/glibc.git
				synced 2025-10-30 10:45:40 +03:00 
			
		
		
		
	2004-09-13 Ulrich Drepper <drepper@redhat.com> * misc/sys/cdefs.h: Restore old definition of __P. * csu/munch.awk: Remove uses of __P and __PMT. * gmon/gmon.c: Likewise. * hesiod/hesiod.h: Likewise. * include/stdio.h: Likewise. * io/fts.c: Likewise. * libio/genops.c: Likewise. * libio/libioP.h: Likewise. * libio/fileops.c: Likewise. * libio/iolibio.h: Likewise. * libio/libio.h: Likewise. * libio/memstream.c: Likewise. * libio/oldfileops.c: Likewise. * libio/oldstdfiles.c: Likewise. * libio/iopopen.c: Likewise. * libio/vsnprintf.c: Likewise. * libio/vswprintf.c: Likewise. * libio/wgenops.c: Likewise. * libio/oldiopopen.c: Likewise. * locale/programs/xmalloc.c: Likewise. * locale/programs/xstrdup.c: Likewise. * malloc/mtrace.c: Likewise. * misc/getttyent.c: Likewise. * misc/getusershell.c: Likewise. * nis/rpcsvc/ypupd.h: Likewise. * posix/fnmatch.h: Likewise. * posix/glob.h: Likewise. * resolv/arpa/nameser.h: Likewise. * resolv/gethnamaddr.c: Likewise. * resolv/resolv.h: Likewise. * resolv/inet_net_ntop.c: Likewise. * resolv/inet_net_pton.c: Likewise. * resolv/res_init.c: Likewise. * resolv/nss_dns/dns-network.c: Likewise. * stdio-common/vfprintf.c: Likewise. * stdio-common/reg-printf.c: Likewise. * sysdeps/generic/chflags.c: Likewise. * sysdeps/generic/fchflags.c: Likewise. * sysdeps/generic/glob.c: Likewise. * sysdeps/generic/printf_fphex.c: Likewise. * sysdeps/generic/memcmp.c: Likewise. * sysdeps/generic/memcopy.h: Likewise. * sysdeps/generic/morecore.c: Likewise. * sysdeps/generic/sstk.c: Likewise. * sysdeps/posix/sigvec.c: Likewise. * sysdeps/posix/ttyname_r.c: Likewise. * sysdeps/standalone/arm/bits/errno.h: Likewise. * sysdeps/standalone/standalone.h: Likewise. * sysdeps/standalone/i386/force_cpu386/brdinit.c: Likewise. * sysdeps/standalone/i386/force_cpu386/_exit.c: Likewise. * sysdeps/unix/arm/start.c: Likewise. * sysdeps/unix/bsd/sigaction.c: Likewise. * sysdeps/unix/bsd/sun/m68k/sigtramp.c: Likewise. * sysdeps/unix/bsd/sun/sparc/sigtramp.c: Likewise. * sysdeps/unix/bsd/sun/sunos4/wait4.c: Likewise. * sysdeps/unix/bsd/ultrix4/mips/sigvec.c: Likewise. * sysdeps/unix/bsd/ultrix4/sysconf.c: Likewise. * sysdeps/unix/sparc/start.c: Likewise. * sysdeps/unix/sysv/getdents.c: Likewise. * sysdeps/unix/sysv/irix4/fpathconf.c: Likewise. * sysdeps/unix/sysv/irix4/getgroups.c: Likewise. * sysdeps/unix/sysv/irix4/getpriority.c: Likewise. * sysdeps/unix/sysv/irix4/getrusage.c: Likewise. * sysdeps/unix/sysv/irix4/pathconf.c: Likewise. * sysdeps/unix/sysv/irix4/setgroups.c: Likewise. * sysdeps/unix/sysv/irix4/sigtramp.c: Likewise. * sysdeps/unix/sysv/irix4/start.c: Likewise. * sysdeps/unix/sysv/irix4/sysconf.c: Likewise. * sysdeps/unix/sysv/sco3.2.4/__setpgid.c: Likewise. * sysdeps/unix/sysv/sco3.2.4/getgroups.c: Likewise. * sysdeps/unix/sysv/sysv4/__getpgid.c: Likewise. * sysdeps/unix/sysv/sysv4/__setpgid.c: Likewise. * sysdeps/unix/sysv/sysv4/getpgid.c: Likewise. * sysdeps/unix/sysv/sysv4/setpgid.c: Likewise. * sysdeps/unix/sysv/sysv4/sethostname.c: Likewise. * sysdeps/unix/sysv/sysv4/setsid.c: Likewise. * sysdeps/unix/sysv/sysv4/sysconf.c: Likewise. * sysdeps/unix/sysv/sysv4/waitpid.c: Likewise. * sysdeps/unix/sysv/sysv4/solaris2/getdents.c: Likewise. * time/tzset.c: Likewise. * time/strftime_l.c: Likewise. * time/strptime_l.c: Likewise. * crypt/md5.h: Likewise.
		
			
				
	
	
		
			141 lines
		
	
	
		
			3.3 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			141 lines
		
	
	
		
			3.3 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * Copyright (c) 1996,1999 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 const char rcsid[] = "$BINDId: inet_net_ntop.c,v 1.6 1999/01/08 19:23:42 vixie Exp $";
 | |
| #endif
 | |
| 
 | |
| #include <sys/types.h>
 | |
| #include <sys/socket.h>
 | |
| #include <netinet/in.h>
 | |
| #include <arpa/inet.h>
 | |
| 
 | |
| #include <errno.h>
 | |
| #include <stdio.h>
 | |
| #include <string.h>
 | |
| #include <stdlib.h>
 | |
| 
 | |
| #ifdef SPRINTF_CHAR
 | |
| # define SPRINTF(x) strlen(sprintf/**/x)
 | |
| #else
 | |
| # define SPRINTF(x) ((size_t)sprintf x)
 | |
| #endif
 | |
| 
 | |
| static char *	inet_net_ntop_ipv4 (const u_char *src, int bits,
 | |
| 				    char *dst, size_t size) __THROW;
 | |
| 
 | |
| /*
 | |
|  * char *
 | |
|  * inet_net_ntop(af, src, bits, dst, size)
 | |
|  *	convert network number from network to presentation format.
 | |
|  *	generates CIDR style result always.
 | |
|  * return:
 | |
|  *	pointer to dst, or NULL if an error occurred (check errno).
 | |
|  * author:
 | |
|  *	Paul Vixie (ISC), July 1996
 | |
|  */
 | |
| char *
 | |
| inet_net_ntop(af, src, bits, dst, size)
 | |
| 	int af;
 | |
| 	const void *src;
 | |
| 	int bits;
 | |
| 	char *dst;
 | |
| 	size_t size;
 | |
| {
 | |
| 	switch (af) {
 | |
| 	case AF_INET:
 | |
| 		return (inet_net_ntop_ipv4(src, bits, dst, size));
 | |
| 	default:
 | |
| 		__set_errno (EAFNOSUPPORT);
 | |
| 		return (NULL);
 | |
| 	}
 | |
| }
 | |
| 
 | |
| /*
 | |
|  * static char *
 | |
|  * inet_net_ntop_ipv4(src, bits, dst, size)
 | |
|  *	convert IPv4 network number from network to presentation format.
 | |
|  *	generates CIDR style result always.
 | |
|  * return:
 | |
|  *	pointer to dst, or NULL if an error occurred (check errno).
 | |
|  * note:
 | |
|  *	network byte order assumed.  this means 192.5.5.240/28 has
 | |
|  *	0b11110000 in its fourth octet.
 | |
|  * author:
 | |
|  *	Paul Vixie (ISC), July 1996
 | |
|  */
 | |
| static char *
 | |
| inet_net_ntop_ipv4(src, bits, dst, size)
 | |
| 	const u_char *src;
 | |
| 	int bits;
 | |
| 	char *dst;
 | |
| 	size_t size;
 | |
| {
 | |
| 	char *odst = dst;
 | |
| 	char *t;
 | |
| 	u_int m;
 | |
| 	int b;
 | |
| 
 | |
| 	if (bits < 0 || bits > 32) {
 | |
| 		__set_errno (EINVAL);
 | |
| 		return (NULL);
 | |
| 	}
 | |
| 	if (bits == 0) {
 | |
| 		if (size < sizeof "0")
 | |
| 			goto emsgsize;
 | |
| 		*dst++ = '0';
 | |
| 		size--;
 | |
| 		*dst = '\0';
 | |
| 	}
 | |
| 
 | |
| 	/* Format whole octets. */
 | |
| 	for (b = bits / 8; b > 0; b--) {
 | |
| 		if (size < sizeof "255.")
 | |
| 			goto emsgsize;
 | |
| 		t = dst;
 | |
| 		dst += SPRINTF((dst, "%u", *src++));
 | |
| 		if (b > 1) {
 | |
| 			*dst++ = '.';
 | |
| 			*dst = '\0';
 | |
| 		}
 | |
| 		size -= (size_t)(dst - t);
 | |
| 	}
 | |
| 
 | |
| 	/* Format partial octet. */
 | |
| 	b = bits % 8;
 | |
| 	if (b > 0) {
 | |
| 		if (size < sizeof ".255")
 | |
| 			goto emsgsize;
 | |
| 		t = dst;
 | |
| 		if (dst != odst)
 | |
| 			*dst++ = '.';
 | |
| 		m = ((1 << b) - 1) << (8 - b);
 | |
| 		dst += SPRINTF((dst, "%u", *src & m));
 | |
| 		size -= (size_t)(dst - t);
 | |
| 	}
 | |
| 
 | |
| 	/* Format CIDR /width. */
 | |
| 	if (size < sizeof "/32")
 | |
| 		goto emsgsize;
 | |
| 	dst += SPRINTF((dst, "/%u", bits));
 | |
| 	return (odst);
 | |
| 
 | |
|  emsgsize:
 | |
| 	__set_errno (EMSGSIZE);
 | |
| 	return (NULL);
 | |
| }
 |