aboutsummaryrefslogtreecommitdiff
path: root/inet/ether_line.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-05-24 08:49:00 +0000
committerUlrich Drepper <drepper@redhat.com>2002-05-24 08:49:00 +0000
commitc0a0f9a32c8baa6ab93d00eb42d92c02e9e146d7 (patch)
tree8cf43cdab37f80704e698ccc65b752b93320fa11 /inet/ether_line.c
parent12b7f470d21eeb897e25b9ef6dae4bfd787168f6 (diff)
downloadglibc-c0a0f9a32c8baa6ab93d00eb42d92c02e9e146d7.tar
glibc-c0a0f9a32c8baa6ab93d00eb42d92c02e9e146d7.tar.gz
glibc-c0a0f9a32c8baa6ab93d00eb42d92c02e9e146d7.tar.bz2
glibc-c0a0f9a32c8baa6ab93d00eb42d92c02e9e146d7.zip
Update.
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.
Diffstat (limited to 'inet/ether_line.c')
-rw-r--r--inet/ether_line.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/inet/ether_line.c b/inet/ether_line.c
index d9ad918905..7e871a6bd7 100644
--- a/inet/ether_line.c
+++ b/inet/ether_line.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1999 Free Software Foundation, Inc.
+/* 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
@@ -46,7 +46,7 @@ ether_line (const char *line, struct ether_addr *addr, char *hostname)
if ((ch < '0' || ch > '9') && (ch < 'a' || ch > 'f'))
return -1;
number <<= 4;
- number = isdigit (ch) ? (ch - '0') : (ch - 'a' + 10);
+ number += isdigit (ch) ? (ch - '0') : (ch - 'a' + 10);
ch = *line;
if (cnt < 5 && ch != ':')
@@ -65,15 +65,15 @@ ether_line (const char *line, struct ether_addr *addr, char *hostname)
cp = __strchrnul (line, '#');
while (cp > line && isspace (cp[-1]))
--cp;
- *cp = '\0';
- if (*line == '\0')
+ 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. */
- strcpy (hostname, line);
+ memcpy (hostname, line, cp - line);
+ hostname [cp - line] = '\0';
return 0;
}