mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-22 19:00:07 +00:00
a585ba226b
__libc_system. (__libc_system): Call it, putting just the line == NULL test here. * include/libc-symbols.h (__hidden_proto): Add extern keywords so variables work right. * elf/dl-open.c (dl_open_worker): Use _ macro instead of gettext. * elf/dl-close.c (_dl_close): Likewise. * include/netinet/in.h: Use libc_hidden_proto for bindresvport, in6addr_any, in6addr_loopback. Remove decls for bindresvport_internal, in6addr_any_internal, in6addr_loopback_internal. * sunrpc/svc_udp.c (svcudp_bufcreate): Nix INTUSE for bindresvport. * sunrpc/svc_tcp.c (svctcp_create): Likewise. * sunrpc/clnt_udp.c (clntudp_bufcreate): Likewise. * sunrpc/bindrsvprt.c: Change INTDEF to libc_hidden_def. * inet/in6_addr.c: Change INTVARDEF to libc_hidden_def. * sysdeps/posix/getaddrinfo.c (gaih_inet): Nix INTUSE for in6addr_loopback. * inet/gethstbyad_r.c (PREPROCESS): Nix INTUSE for in6addr_any. * include/netinet/ether.h: Use libc_hidden_proto for ether_ntoa_r, ether_aton_r. * inet/ether_aton_r.c: Add libc_hidden_def. * inet/ether_ntoa_r.c: Likewise. * include/rpc/auth.h: Use libc_hidden_proto for getnetname, netname2user, host2netname. * sunrpc/netname.c: Add libc_hidden_def. * include/netdb.h: Use libc_hidden_proto for innetgr, rcmd_af, rexec_af, rresvport_af, ruserok_af. * inet/rcmd.c: Add libc_hidden_def. * inet/getnetgrent_r.c: Likewise.
65 lines
1.8 KiB
C
65 lines
1.8 KiB
C
/* Copyright (C) 1996,97,98,99,2002 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
#include <ctype.h>
|
|
#include <stdlib.h>
|
|
#include <netinet/ether.h>
|
|
#include <netinet/if_ether.h>
|
|
|
|
|
|
struct ether_addr *
|
|
ether_aton_r (const char *asc, struct ether_addr *addr)
|
|
{
|
|
size_t cnt;
|
|
|
|
for (cnt = 0; cnt < 6; ++cnt)
|
|
{
|
|
unsigned int number;
|
|
char ch;
|
|
|
|
ch = _tolower (*asc++);
|
|
if ((ch < '0' || ch > '9') && (ch < 'a' || ch > 'f'))
|
|
return NULL;
|
|
number = isdigit (ch) ? (ch - '0') : (ch - 'a' + 10);
|
|
|
|
ch = _tolower (*asc);
|
|
if ((cnt < 5 && ch != ':') || (cnt == 5 && ch != '\0' && !isspace (ch)))
|
|
{
|
|
++asc;
|
|
if ((ch < '0' || ch > '9') && (ch < 'a' || ch > 'f'))
|
|
return NULL;
|
|
number <<= 4;
|
|
number += isdigit (ch) ? (ch - '0') : (ch - 'a' + 10);
|
|
|
|
ch = *asc;
|
|
if (cnt < 5 && ch != ':')
|
|
return NULL;
|
|
}
|
|
|
|
/* Store result. */
|
|
addr->ether_addr_octet[cnt] = (unsigned char) number;
|
|
|
|
/* Skip ':'. */
|
|
++asc;
|
|
}
|
|
|
|
return addr;
|
|
}
|
|
libc_hidden_def (ether_aton_r)
|