mirror of
https://sourceware.org/git/glibc.git
synced 2025-09-02 16:01:20 +03:00
Update.
2000-02-11 Ulrich Drepper <drepper@redhat.com> * stdio-common/printf-parse.h (parse_one_spec): Set wide elements. * stdio-common/printf_fp.c: Truely support wide characater output. Finally handle decimal points and thousands separator characters correctly for multibyte output. * stdio-common/printf_size.c: Likewise. * sysdeps/generic/printf_fphex.c: Likewise. * sysdeps/ieee754/ldbl-96/printf_fphex.c: Likewise. * stdio-common/vfscanf.c: Implement I modifier for numbers to read locale dependent digits. * locale/C-monetary.c (_nl_C_LC_MONETARY): Change wide character decimal point and thousands separator values to wide characters from wide character strings. * locale/C-numeric.c (_nl_C_LC_NUMERIC): Likewise. * locale/indigitswc.h: Dereference wcdigits array elements. 2000-02-03 Jakub Jelinek <jakub@redhat.com> * stdlib/canonicalize.c (canonicalize): Zero terminate path to copy on error. 2000-02-01 Cristian Gafton <gafton@redhat.com> * misc/syslog.c (closelog): Reset LogType to SOCK_DGRAM. 2000-01-31 Philip Blundell <philb@gnu.org> * sysdeps/arm/fpu/fpu_control.h (_FPU_DEFAULT): Set the AC bit. 2000-01-31 Andreas Jaeger <aj@suse.de> * intl/Makefile (generated): msgs.h is generated. * localedata/Makefile (generated-dirs): Add de_DE.437. 2000-01-31 Jakub Jelinek <jakub@redhat.com> * config.make.in: Allow default localedir to come from configure. * configure.in: Export libc_cv_localedir. * sysdeps/unix/sysv/linux/configure.in: For sparc64, put locale stuff into $exec_prefix/lib/locale because it can be shared between 32bit and 64bit libraries. * configure: Rebuilt. * sysdeps/unix/sysv/linux/configure: Rebuilt. 2000-01-31 Andreas Jaeger <aj@suse.de> * inet/tst-network.c: New file. * inet/Makefile (tests): Add tst-network. * inet/inet_net.c (inet_network): Don't overwrite memory or allow to great last digits.
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
# Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98, 99 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1991-1999, 2000 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
|
||||
@@ -48,7 +48,7 @@ routines := htonl htons \
|
||||
in6_addr getnameinfo if_index getipnodebyad freehostent \
|
||||
getipnodebynm
|
||||
|
||||
tests := htontest test_ifindex tst-ntoa tst-ether_aton tst-ipnode
|
||||
tests := htontest test_ifindex tst-ntoa tst-ether_aton tst-ipnode tst-network
|
||||
|
||||
# No warnings about losing BSD code.
|
||||
CFLAGS-rcmd.c = -w
|
||||
|
@@ -66,7 +66,7 @@ again:
|
||||
continue;
|
||||
}
|
||||
if (base == 16 && isxdigit(c)) {
|
||||
val = (val << 4) + (c + 10 - (islower(c) ? 'a' : 'A'));
|
||||
val = (val << 4) + (tolower (c) + 10 - 'a');
|
||||
cp++;
|
||||
digit = 1;
|
||||
continue;
|
||||
@@ -75,9 +75,9 @@ again:
|
||||
}
|
||||
if (!digit)
|
||||
return (INADDR_NONE);
|
||||
if (pp >= parts + 4 || val > 0xff)
|
||||
return (INADDR_NONE);
|
||||
if (*cp == '.') {
|
||||
if (pp >= parts + 4 || val > 0xff)
|
||||
return (INADDR_NONE);
|
||||
*pp++ = val, cp++;
|
||||
goto again;
|
||||
}
|
||||
@@ -85,8 +85,6 @@ again:
|
||||
return (INADDR_NONE);
|
||||
*pp++ = val;
|
||||
n = pp - parts;
|
||||
if (n > 4)
|
||||
return (INADDR_NONE);
|
||||
for (val = 0, i = 0; i < n; i++) {
|
||||
val <<= 8;
|
||||
val |= parts[i] & 0xff;
|
||||
|
73
inet/tst-network.c
Normal file
73
inet/tst-network.c
Normal file
@@ -0,0 +1,73 @@
|
||||
/* Test for inet_network.
|
||||
Copyright (C) 2000 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
Contributed by Andreas Jaeger <aj@suse.de>, 2000.
|
||||
|
||||
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 <stdio.h>
|
||||
#include <sys/socket.h>
|
||||
#include <netinet/in.h>
|
||||
#include <arpa/inet.h>
|
||||
|
||||
struct
|
||||
{
|
||||
const char *network;
|
||||
uint32_t number;
|
||||
} tests [] =
|
||||
{
|
||||
{"1.0.0.0", 0x1000000},
|
||||
{"1.0.0", 0x10000},
|
||||
{"1.0", 0x100},
|
||||
{"1", 0x1},
|
||||
{"192.168.0.0", 0xC0A80000},
|
||||
/* Now some invalid addresses. */
|
||||
{"141.30.225.2800", INADDR_NONE},
|
||||
{"141.76.1.1.1", INADDR_NONE},
|
||||
{"141.76.1.11.", INADDR_NONE},
|
||||
{"1410", INADDR_NONE},
|
||||
{"1.1410", INADDR_NONE},
|
||||
{"1.1410.", INADDR_NONE},
|
||||
{"1.1410", INADDR_NONE},
|
||||
{"141.76.1111", INADDR_NONE},
|
||||
{"141.76.1111.", INADDR_NONE}
|
||||
};
|
||||
|
||||
|
||||
int
|
||||
main (void)
|
||||
{
|
||||
int errors = 0;
|
||||
int i;
|
||||
uint32_t res;
|
||||
|
||||
for (i = 0; i < sizeof (tests) / sizeof (tests[0]); ++i)
|
||||
{
|
||||
printf ("Testing: %s\n", tests[i].network);
|
||||
res = inet_network (tests[i].network);
|
||||
|
||||
if (res != tests[i].number)
|
||||
{
|
||||
printf ("Test failed for inet_network (\"%s\"):\n",
|
||||
tests[i].network);
|
||||
printf ("Expected return value %u (0x%x) but got %u (0x%x).\n",
|
||||
tests[i].number, tests[i].number, res, res);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
return errors != 0;
|
||||
}
|
Reference in New Issue
Block a user