mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-27 15:30:07 +00:00
c0a0f9a32c
2002-05-21 Isamu Hasegawa <isamu@yamato.ibm.com> * posix/regex.c: Define `inline' as a macro into nothing for the compilers which lack the keyword. * posix/regex.h: (RE_SYNTAX_GNU_AWK): Remove RE_CONTEXT_INVALID_OPS for the compatibility of gawk. * posix/regcomp.c: Add fake implementation of isblank() for the environments which lack the function. Don't use free_charset() in case of non-i18n envs. (build_range_exp): Don't use i18n related code in case of non-i18n envs. (build_collating_symbol): Likewise. (build_equiv_class): Likewise. (build_charclass): Likewise. (re_compile_fastmap_iter): Likewise. (parse_bracket_exp): Likewise. (build_word_op): Likewise. (regfree): Don't use free_charset() in case of non-i18n envs. * posix/regex_internal.h: Remove COMPLEX_BRACKET from re_token_type_t in case of non-i18n envs. Don't define re_charset_t in case of non-i18n envs. Change the type of wcs of re_string_t from wchar_t to wint_t, since we store also WEOF. * posix/regex_internal.c: (re_string_realloc_buffers): Change the type of wcs of re_string_t from wchar_t to wint_t. (re_string_reconstruct): Likewise. (create_ci_newstate): Don't use i18n related code in case of non-i18n envs. (create_cd_newstate): Likewise. 2002-05-24 Ulrich Drepper <drepper@redhat.com> * iconv/loop.c: Fix typo. 2002-05-23 Jakub Jelinek <jakub@redhat.com> * inet/ether_line.c (ether_line): Fix a typo causing only lower 4 bits of each ethernet address byte being assigned. Don't modify what line points to. * inet/tst-ether_aton.c (main): Add ether_line tests. 2002-05-23 Marcus Brinkmann <marcus@gnu.org> * manual/filesys.texi: Don't make readlink example leak memory when readlink fails.
80 lines
2.2 KiB
C
80 lines
2.2 KiB
C
/* Copyright (C) 1996, 1999, 2002 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 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 <string.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 = __strchrnul (line, '#');
|
|
while (cp > line && isspace (cp[-1]))
|
|
--cp;
|
|
|
|
if (cp == line)
|
|
/* 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. */
|
|
memcpy (hostname, line, cp - line);
|
|
hostname [cp - line] = '\0';
|
|
|
|
return 0;
|
|
}
|