6dbe283756
* nss/Makefile (databases): New variable. (routines, libnss_files-routines): Use it. (subdir-dirs): Compute from $(services). * sysdeps/unix/sysv/linux/syscalls.list (create_module, delete_module, init_module, klogctl): Use EXTRA in the "caller" column so these get added to unix-extra-syscalls and thus compiled in misc. * string/Makefile (routines): Add strndup. * string/strndup.c: New file. * string/string.h: Declare strndup. (strndupa): New macro. * string/string.h: Declare __strdup. * string/strdup.c: Deansideclized. Define __ name and weak alias. * string/string.h: Don't define memccpy as macro for [__OPTIMIZE__]. Thu Jun 27 23:43:22 1996 Richard Henderson <rth@tamu.edu> * sysdeps/alpha/dl-machine.h (elf_machine_rela): The Alpha's address-of operation and plt format conspire to require all dynamic relocs to be resolved to actual symbols not plt entries. Thu Jun 27 02:49:28 1996 Ulrich Drepper <drepper@cygnus.com> * catgets/gencat.c: Add casts to avoid signed<->unsigned warnings. * grp/initgroups.c (initgroups): De-ansi-fy. Move declaration of NGROUPS and GROUPS outside #if so that the code compiles for NGROUPS_MAX != 0. * inet/Makefile (headers): Add netinet/ether.h and netinet/if_ether.h. (routines): Add ether_aton, ether_aton_r, ether_hton, ether_line, ether_ntoa, ether_ntoa_r, and ether_ntoh. * inet/ether_aton.c, inet/ether_aton_r.c, inet/ether_hton.c, inet/ether_line.c, inet/ether_ntoa.c, inet/ether_ntoa_r.c, inet/ether_ntoh.c: New files. Implementation of functions to handle Ethernet address to host mapping. * inet/netinet/ether.h: New file. Declare ether_* functions. * netinet/ether.h: Wrapper around inet/netinet/ether.h for glibc compilation. * nss/ethers-lookup.c: New file. Lookup function for ethers database. * nss/Makefile (routines): Add ethers-lookup. (libnss_files-routines): Add files-ethers. * nss/getXXent_r.c: Don't define set*ent and end*ent function with _r suffix. * nss/nss_files/files-XXX.c (internal_endent): Don't reset KEEP_STREAM every time called. (_nss_files_end): Reset KEEP_STREAM here instead. (internal_getent): If STREAM == NULL try to open instead of signalling error. Use cast to prevent warning. Terminate read line in case the buffer is too small. * nss/nss_files/files-ethers.c: New file. Implementation of Ethernet adress<->hostname lookup through files interface. * stdlib/mbstowcs.c: Define based on mbsrtowcs(). * stdlib/mbtowc.c: Define based on mbrtowc(). * stdlib/wcstombs.c: Define based on wcsrtombs(). * stdlib/wctomb.c: Define based on wcrtomb(). * sunrpc/xdr.c (xdr_u_int): Avoid bogus call to unexpected_sizes_in_xdr_u_int. * sysdeps/generic/netinet/if_ether.h: New file. Generic declaration of `struct ether_addr'. * sysdeps/unix/sysv/linux/netinet/if_ether.h: New file. Linux specific declaration of `struct ether_addr'. * wcsmbs/mbrtowc.c: Handle case where argument PS is NULL. * wcsmbs/mbsrtowcs.c: Ditto. * wcsmbs/wcrtomb.c: Ditto. * wcsmbs/wcsrtombs.c: Ditto. * wcsmbs/mbsinit.c: Prepare for PS being NULL.
80 lines
2.1 KiB
C
80 lines
2.1 KiB
C
/* Copyright (C) 1996 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public License as
|
|
published by the Free Software Foundation; either version 2 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
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with the GNU C Library; see the file COPYING.LIB. If
|
|
not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
#include <stdlib.h>
|
|
#include <netinet/ether.h>
|
|
#include <netinet/if_ether.h>
|
|
|
|
|
|
int
|
|
ether_line (const char *line, struct ether_addr *addr, char *hostname)
|
|
{
|
|
size_t cnt;
|
|
char *cp;
|
|
|
|
for (cnt = 0; cnt < 6; ++cnt)
|
|
{
|
|
unsigned int number;
|
|
char ch;
|
|
|
|
ch = tolower (*line++);
|
|
if ((ch < '0' || ch > '9') && (ch < 'a' || ch > 'f'))
|
|
return -1;
|
|
number = isdigit (ch) ? (ch - '0') : (ch - 'a' + 10);
|
|
|
|
ch = tolower (*line);
|
|
if ((cnt < 5 && ch != ':') || (cnt == 5 && ch != '\0' && !isspace (ch)))
|
|
{
|
|
++line;
|
|
if ((ch < '0' || ch > '9') && (ch < 'a' || ch > 'f'))
|
|
return -1;
|
|
number <<= 4;
|
|
number = isdigit (ch) ? (ch - '0') : (ch - 'a' + 10);
|
|
|
|
ch = *line;
|
|
if (cnt < 5 && ch != ':')
|
|
return -1;
|
|
}
|
|
|
|
/* Store result. */
|
|
addr->ether_addr_octet[cnt] = (unsigned char) number;
|
|
|
|
/* Skip ':'. */
|
|
if (ch != '\0')
|
|
++line;
|
|
}
|
|
|
|
/* Remove trailing white space. */
|
|
cp = strchr (line, '#');
|
|
if (cp == NULL)
|
|
cp = strchr (line, '\0');
|
|
while (cp > line && isspace (cp[-1]))
|
|
--cp;
|
|
*cp = '\0';
|
|
|
|
if (*line == '\0')
|
|
/* No hostname. */
|
|
return -1;
|
|
|
|
/* XXX This can cause trouble because the hostname might be too long
|
|
but we have no possibility to check it here. */
|
|
strcpy (hostname, line);
|
|
|
|
return 0;
|
|
}
|