diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1998-02-17 15:15:51 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1998-02-17 15:15:51 +0000 |
| commit | 0a61487785ff1f13ce3bb683cd59e520bbb0086f (patch) | |
| tree | 11b0c5e1e0cbf6272621ebef0638553ecea8151f | |
| parent | 3858abff55a4088377ceaeeccf5ff06d6129b331 (diff) | |
| download | glibc-0a61487785ff1f13ce3bb683cd59e520bbb0086f.tar.xz glibc-0a61487785ff1f13ce3bb683cd59e520bbb0086f.zip | |
Update.
1998-02-17 15:10 Ulrich Drepper <drepper@cygnus.com>
* elf/dl-load.c (open_path): Use __xstat instead of stat.
* localedata/tst-locale.sh: Comment out first test for now.
1998-02-14 14:58 H.J. Lu <hjl@gnu.org>
* sysdeps/generic/_G_config.h (_G_HAVE_IO_GETLINE_INFO): Defined
as 1.
* sysdeps/unix/sysv/linux/_G_config.h (_G_HAVE_IO_GETLINE_INFO):
Likewise.
* libio/iogetline.c (_IO_getline_info): Renamed from
_IO_getline.
(_IO_getline): Just call _IO_getline_info.
* libio/libioP.h (_IO_getline_info): New declaration.
* libc.map (_IO_getline_info, __write): Added.
1998-02-17 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sunrpc/rpc_cout.c (inline_struct): Change typo of plus to
const char* to shut up gcc.
1998-02-17 11:37 Ulrich Drepper <drepper@cygnus.com>
* eld/dl-open.c (_dl_open): Assign correct value to new->l_global.
Patch forwarded by Cristian Gafton <gafton@redhat.com>.
* math/math.h: Define M_* constants always as `double' and add new
macros M_*l which are of type `long double'.
* sysdeps/libm-ieee754/s_cacoshl.c: Use M_*l constants now.
* sysdeps/libm-ieee754/s_cacosl.c: Likewise.
* sysdeps/libm-ieee754/s_casinhl.c: Likewise.
* sysdeps/libm-ieee754/s_catanhl.c: Likewise.
* sysdeps/libm-ieee754/s_catanl.c: Likewise.
* sysdeps/libm-ieee754/s_clog10l.c: Likewise.
* sysdeps/libm-ieee754/s_clogl.c: Likewise.
* math/libm-tst.c: Likewise.
* sysdeps/i386/fpu/bits/mathinline.h (__M_SQRT2): Don't use _Mdbl,
define as long double unconditionally.
1998-02-17 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* manual/arith.texi (Old-style number conversion): Correct some
typos.
1998-02-16 16:28 H.J. Lu <hjl@gnu.org>
* time/Makefile (tz-cflags, CFLAGS-tzfile.c, CFLAGS-tzset.c):
Restore.
* timezone/Makefile (CFLAGS-tzfile.c, CFLAGS-tzset.c): Deleted.
| -rw-r--r-- | ChangeLog | 57 | ||||
| -rw-r--r-- | elf/dl-load.c | 6 | ||||
| -rw-r--r-- | elf/dl-open.c | 2 | ||||
| -rw-r--r-- | libc.map | 5 | ||||
| -rw-r--r-- | libio/iogetline.c | 81 | ||||
| -rw-r--r-- | libio/libioP.h | 4 | ||||
| -rw-r--r-- | localedata/Makefile | 8 | ||||
| -rwxr-xr-x | localedata/tst-locale.sh | 4 | ||||
| -rw-r--r-- | manual/arith.texi | 28 | ||||
| -rw-r--r-- | math/libm-test.c | 464 | ||||
| -rw-r--r-- | math/math.h | 66 | ||||
| -rw-r--r-- | sunrpc/rpc_cout.c | 12 | ||||
| -rw-r--r-- | sysdeps/generic/_G_config.h | 1 | ||||
| -rw-r--r-- | sysdeps/i386/fpu/bits/mathinline.h | 4 | ||||
| -rw-r--r-- | sysdeps/libm-ieee754/s_cacoshl.c | 10 | ||||
| -rw-r--r-- | sysdeps/libm-ieee754/s_cacosl.c | 4 | ||||
| -rw-r--r-- | sysdeps/libm-ieee754/s_casinhl.c | 4 | ||||
| -rw-r--r-- | sysdeps/libm-ieee754/s_catanhl.c | 6 | ||||
| -rw-r--r-- | sysdeps/libm-ieee754/s_catanl.c | 6 | ||||
| -rw-r--r-- | sysdeps/libm-ieee754/s_clog10l.c | 6 | ||||
| -rw-r--r-- | sysdeps/libm-ieee754/s_clogl.c | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/_G_config.h | 1 | ||||
| -rw-r--r-- | time/Makefile | 7 | ||||
| -rw-r--r-- | timezone/Makefile | 2 |
24 files changed, 456 insertions, 336 deletions
@@ -1,3 +1,60 @@ +1998-02-17 15:10 Ulrich Drepper <drepper@cygnus.com> + + * elf/dl-load.c (open_path): Use __xstat instead of stat. + + * localedata/tst-locale.sh: Comment out first test for now. + +1998-02-14 14:58 H.J. Lu <hjl@gnu.org> + + * sysdeps/generic/_G_config.h (_G_HAVE_IO_GETLINE_INFO): Defined + as 1. + * sysdeps/unix/sysv/linux/_G_config.h (_G_HAVE_IO_GETLINE_INFO): + Likewise. + + * libio/iogetline.c (_IO_getline_info): Renamed from + _IO_getline. + (_IO_getline): Just call _IO_getline_info. + + * libio/libioP.h (_IO_getline_info): New declaration. + + * libc.map (_IO_getline_info, __write): Added. + +1998-02-17 Andreas Jaeger <aj@arthur.rhein-neckar.de> + + * sunrpc/rpc_cout.c (inline_struct): Change typo of plus to + const char* to shut up gcc. + +1998-02-17 11:37 Ulrich Drepper <drepper@cygnus.com> + + * eld/dl-open.c (_dl_open): Assign correct value to new->l_global. + Patch forwarded by Cristian Gafton <gafton@redhat.com>. + + * math/math.h: Define M_* constants always as `double' and add new + macros M_*l which are of type `long double'. + * sysdeps/libm-ieee754/s_cacoshl.c: Use M_*l constants now. + * sysdeps/libm-ieee754/s_cacosl.c: Likewise. + * sysdeps/libm-ieee754/s_casinhl.c: Likewise. + * sysdeps/libm-ieee754/s_catanhl.c: Likewise. + * sysdeps/libm-ieee754/s_catanl.c: Likewise. + * sysdeps/libm-ieee754/s_clog10l.c: Likewise. + * sysdeps/libm-ieee754/s_clogl.c: Likewise. + * math/libm-tst.c: Likewise. + + * sysdeps/i386/fpu/bits/mathinline.h (__M_SQRT2): Don't use _Mdbl, + define as long double unconditionally. + +1998-02-17 Andreas Jaeger <aj@arthur.rhein-neckar.de> + + * manual/arith.texi (Old-style number conversion): Correct some + typos. + +1998-02-16 16:28 H.J. Lu <hjl@gnu.org> + + * time/Makefile (tz-cflags, CFLAGS-tzfile.c, CFLAGS-tzset.c): + Restore. + + * timezone/Makefile (CFLAGS-tzfile.c, CFLAGS-tzset.c): Deleted. + 1998-02-16 Ulrich Drepper <drepper@cygnus.com> * elf/Makefile ($(objpfx)ld.so): Don't depend on rtld-script but diff --git a/elf/dl-load.c b/elf/dl-load.c index 73cafcca37..96c1eb6bc6 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -832,7 +832,8 @@ open_path (const char *name, size_t namelen, buf[this_dir->machdirnamelen - 1] = '\0'; - if (stat (buf, &st) != 0 || ! S_ISDIR (st.st_mode)) + if (__xstat (_STAT_VER, buf, &st) != 0 + || ! S_ISDIR (st.st_mode)) /* The directory does not exist ot it is no directory. */ this_dir->machdirstatus = nonexisting; else @@ -863,7 +864,8 @@ open_path (const char *name, size_t namelen, buf[this_dir->dirnamelen - 1] = '\0'; - if (stat (buf, &st) != 0 || ! S_ISDIR (st.st_mode)) + if (__xstat (_STAT_VER, buf, &st) != 0 + || ! S_ISDIR (st.st_mode)) /* The directory does not exist ot it is no directory. */ this_dir->dirstatus = nonexisting; else diff --git a/elf/dl-open.c b/elf/dl-open.c index b984aa8f89..d095f5e65d 100644 --- a/elf/dl-open.c +++ b/elf/dl-open.c @@ -110,7 +110,7 @@ _dl_open (const char *file, int mode) l = l->l_prev; } - new->l_global = (mode & RTLD_GLOBAL); + new->l_global = (mode & RTLD_GLOBAL) ? 1 : 0; if (new->l_global) { /* The symbols of the new object and its dependencies are to be @@ -100,7 +100,7 @@ GLIBC_2.0 { __vsscanf; __vfscanf; __vsnprintf; _rpc_dtablesize; _null_auth; _seterr_reply; __res_randomid; __syscall_rt_sigqueueinfo; __getpid; __pread64; __pwrite64; - __strcasecmp; + __strcasecmp; __write; # Exception handling support functions from libgcc __register_frame; __register_frame_table; __deregister_frame; @@ -470,4 +470,7 @@ GLIBC_2.1 { # New special glibc functions. gnu_get_libc_release; gnu_get_libc_version; + + # Changed getline function in libio. + _IO_getline_info; } GLIBC_2.0; diff --git a/libio/iogetline.c b/libio/iogetline.c index bd1a7431f3..328e20e6ea 100644 --- a/libio/iogetline.c +++ b/libio/iogetline.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1993, 1997, 1998 Free Software Foundation, Inc. This file is part of the GNU IO Library. This library is free software; you can redistribute it and/or @@ -26,6 +26,19 @@ #include "libioP.h" #include <string.h> +#if defined _LIBC || !_G_HAVE_IO_GETLINE_INFO + +_IO_size_t +_IO_getline (fp, buf, n, delim, extract_delim) + _IO_FILE *fp; + char *buf; + _IO_size_t n; + int delim; + int extract_delim; +{ + return _IO_getline_info (fp, buf, n, delim, extract_delim, (int *) 0); +} + /* Algorithm based on that used by Berkeley pre-4.4 fgets implementation. Read chars into buf (of size n), until delim is seen. @@ -35,44 +48,68 @@ If extract_delim > 0, insert delim in output. */ _IO_size_t -_IO_getline (fp, buf, n, delim, extract_delim) +_IO_getline_info (fp, buf, n, delim, extract_delim, eof) _IO_FILE *fp; char *buf; _IO_size_t n; int delim; int extract_delim; + int *eof; { char *ptr = buf; + if (eof != NULL) + *eof = 0; do { _IO_ssize_t len = fp->_IO_read_end - fp->_IO_read_ptr; - char *t; if (len <= 0) - if (__underflow (fp) == EOF) - break; - else - len = fp->_IO_read_end - fp->_IO_read_ptr; - if ((_IO_size_t) len >= n) - len = n; - t = (char *) memchr ((void *) fp->_IO_read_ptr, delim, len); - if (t != NULL) { - _IO_size_t old_len = ptr-buf; - len = t - fp->_IO_read_ptr; - if (extract_delim >= 0) + int c = __uflow (fp); + if (c == EOF) { - ++t; + if (eof) *eof = c; + break; + } + if (c == delim) + { + if (extract_delim > 0) + *ptr++ = c; + else if (extract_delim < 0) + _IO_sputbackc (fp, c); + return ptr - buf; if (extract_delim > 0) ++len; } - memcpy ((void *) ptr, (void *) fp->_IO_read_ptr, len); - fp->_IO_read_ptr = t; - return old_len + len; + *ptr++ = c; + n--; } - memcpy ((void *) ptr, (void *) fp->_IO_read_ptr, len); - fp->_IO_read_ptr += len; - ptr += len; - n -= len; + else + { + char *t; + if ((_IO_size_t) len >= n) + len = n; + t = (char *) memchr ((void *) fp->_IO_read_ptr, delim, len); + if (t != NULL) + { + _IO_size_t old_len = ptr-buf; + len = t - fp->_IO_read_ptr; + if (extract_delim >= 0) + { + ++t; + if (extract_delim > 0) + ++len; + } + memcpy ((void *) ptr, (void *) fp->_IO_read_ptr, len); + fp->_IO_read_ptr = t; + return old_len + len; + } + memcpy ((void *) ptr, (void *) fp->_IO_read_ptr, len); + fp->_IO_read_ptr += len; + ptr += len; + n -= len; + } } while (n != 0); return ptr - buf; } + +#endif /* Defined _LIBC || !_G_HAVE_IO_GETLINE_INFO */ diff --git a/libio/libioP.h b/libio/libioP.h index 568bbe8812..785bfee08a 100644 --- a/libio/libioP.h +++ b/libio/libioP.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1993, 1997, 1998 Free Software Foundation, Inc. This file is part of the GNU IO Library. This library is free software; you can redistribute it and/or @@ -428,6 +428,8 @@ extern int _IO_vsnprintf __P ((char *string, _IO_size_t maxlen, extern _IO_size_t _IO_getline __P ((_IO_FILE *,char *, _IO_size_t, int, int)); +extern _IO_size_t _IO_getline_info __P ((_IO_FILE *,char *, _IO_size_t, + int, int, int *)); extern _IO_ssize_t _IO_getdelim __P ((char **, _IO_size_t *, int, _IO_FILE *)); extern double _IO_strtod __P ((const char *, char **)); extern char *_IO_dtoa __P ((double __d, int __mode, int __ndigits, diff --git a/localedata/Makefile b/localedata/Makefile index 2d45558eb1..4e26d15374 100644 --- a/localedata/Makefile +++ b/localedata/Makefile @@ -37,13 +37,13 @@ test-output := $(foreach s, .out .xout, \ generated := $(test-input) $(test-output) generated-dirs := $(basename $(test-input)) en_US -test-names := test1 test2 test3 test4 -test-srcs := $(addprefix tests/,$(addsuffix .cm,$(test-names)) \ - $(addsuffix .def,$(test-names))) +ld-test-names := test1 test2 test3 test4 +ld-test-srcs := $(addprefix tests/,$(addsuffix .cm,$(ld-test-names)) \ + $(addsuffix .def,$(ld-test-names))) distribute := CHECKSUMS tst-fmon.sh tst-fmon.data ChangeLog sort-test.sh \ README mnemonic.ds fr_CA,2.13.in de_DE.in da_DK.in \ - $(charmaps) $(locales) $(test-srcs) + $(charmaps) $(locales) $(ld-test-srcs) # Get $(inst_i18ndir) defined. include ../Makeconfig diff --git a/localedata/tst-locale.sh b/localedata/tst-locale.sh index f6182e6daf..699a18b8aa 100755 --- a/localedata/tst-locale.sh +++ b/localedata/tst-locale.sh @@ -38,7 +38,9 @@ test_locale () fi } -test_locale IBM437 de_DE de_DE.437 +# I take this out for now since it is a known problem +# (see [PR libc/229] and [PR libc/454]. +# test_locale IBM437 de_DE de_DE.437 test_locale tests/test1.cm tests/test1.def test1 test_locale tests/test2.cm tests/test2.def test2 test_locale tests/test3.cm tests/test3.def test3 diff --git a/manual/arith.texi b/manual/arith.texi index 3b060689a9..22819b12f4 100644 --- a/manual/arith.texi +++ b/manual/arith.texi @@ -1337,7 +1337,7 @@ extensions in the same sense. Generally, you should avoid using these functions unless the really fit into the problem you have to to solve. Otherwise it is almost always -better to use @code{sprinf} since it's greater availability (it is an +better to use @code{sprintf} since its greater availability (it is an @w{ISO C} function). @@ -1387,14 +1387,14 @@ The prototype for this function can be found in @file{stdlib.h}. @comment SVID, Unix98 @deftypefun {char *} gcvt (double @var{value}, int @var{ndigit}, char *@var{buf}) The @code{gcvt} function also converts @var{value} to a NUL terminated -string but does in a way similar to the @code{%g} format of -@code{printf}. It also does not use a static buffer but instead uses +string but in a way similar to the @code{%g} format of +@code{sprintf}. It also does not use a static buffer but instead uses the user-provided buffer starting at @var{buf}. It is the user's responsibility to make sure the buffer is long enough to contain the -result. Unlike the @code{ecvt} and @code{fcvt} function @code{gcvt} -includes the sign and the decimal point character (which is determined +result. Unlike the @code{ecvt} and @code{fcvt} functions @code{gcvt} +includes the sign and the decimal point characters (which are determined according to the current locale) in the result. Therefore there are yet -less reasons to use this function instead of @code{printf}. +less reasons to use this function instead of @code{sprintf}. The return value is @var{buf}. @@ -1402,11 +1402,11 @@ The prototype for this function can be found in @file{stdlib.h}. @end deftypefun -All these three functions have in common that they use @code{double} -values as the parameters. Calling these functions using @code{long +All three functions have in common that they use @code{double} +values as parameter. Calling these functions using @code{long double} values would mean a loss of precision due to the implicit rounding. Therefore the GNU C library contains three more functions -with similar semantic which take @code{long double} values. +with similar semantics which take @code{long double} values. @comment stdlib.h @comment GNU @@ -1453,7 +1453,7 @@ is no need for a @code{gcvt_r} function. @deftypefun {char *} ecvt_r (double @var{value}, int @var{ndigit}, int *@var{decpt}, int *@var{sign}, char *@var{buf}, size_t @var{len}) The @code{ecvt_r} function is similar to the @code{ecvt} function except that it places its result into the user-specified buffer starting at -@var{buf}. +@var{buf} with length @var{len}. This function is a GNU extension. The prototype can be found in @file{stdlib.h}. @@ -1464,7 +1464,7 @@ This function is a GNU extension. The prototype can be found in @deftypefun {char *} fcvt_r (double @var{value}, int @var{ndigit}, int @var{decpt}, int *@var{sign}, char *@var{buf}, size_t @var{len}) The @code{fcvt_r} function is similar to the @code{fcvt} function except that it places its result into the user-specified buffer starting at -@var{buf}. +@var{buf} with length @var{len}. This function is a GNU extension. The prototype can be found in @file{stdlib.h}. @@ -1475,7 +1475,7 @@ This function is a GNU extension. The prototype can be found in @deftypefun {char *} qecvt_r (long double @var{value}, int @var{ndigit}, int *@var{decpt}, int *@var{sign}, char *@var{buf}, size_t @var{len}) The @code{qecvt_r} function is similar to the @code{qecvt} function except that it places its result into the user-specified buffer starting at -@var{buf}. +@var{buf} with length @var{len}. This function is a GNU extension. The prototype can be found in @file{stdlib.h}. @@ -1483,10 +1483,10 @@ This function is a GNU extension. The prototype can be found in @comment stdlib.h @comment GNU -@deftypefun {char *} qfcvt (long double @var{value}, int @var{ndigit}, int @var{decpt}, int *@var{sign}, char *@var{buf}, size_t @var{len}) +@deftypefun {char *} qfcvt_r (long double @var{value}, int @var{ndigit}, int @var{decpt}, int *@var{sign}, char *@var{buf}, size_t @var{len}) The @code{qfcvt_r} function is similar to the @code{qfcvt} function except that it places its result into the user-specified buffer starting at -@var{buf}. +@var{buf} with length @var{len}. This function is a GNU extension. The prototype can be found in @file{stdlib.h}. diff --git a/math/libm-test.c b/math/libm-test.c index 3dffcad6dc..8fa473eaf5 100644 --- a/math/libm-test.c +++ b/math/libm-test.c @@ -137,9 +137,9 @@ #define NO_PRINT 0 /* Various constants (we must supply them precalculated for accuracy). */ -#define M_PI_6 .52359877559829887308L -#define M_E2 7.389056098930650227230L -#define M_E3 20.08553692318766774093L +#define M_PI_6l .52359877559829887308L +#define M_E2l 7.389056098930650227230L +#define M_E3l 20.08553692318766774093L static int noErrors; /* number of errors */ static int noTests; /* number of tests (without testing exceptions) */ @@ -840,15 +840,15 @@ acos_test (void) FUNC(acos) (x), INVALID_EXCEPTION); #endif - check ("acos (0) == pi/2", FUNC(acos) (0), M_PI_2); - check ("acos (-0) == pi/2", FUNC(acos) (minus_zero), M_PI_2); + check ("acos (0) == pi/2", FUNC(acos) (0), M_PI_2l); + check ("acos (-0) == pi/2", FUNC(acos) (minus_zero), M_PI_2l); check ("acos (1) == 0", FUNC(acos) (1), 0); - check ("acos (-1) == pi", FUNC(acos) (-1), M_PI); + check ("acos (-1) == pi", FUNC(acos) (-1), M_PIl); - check_eps ("acos (0.5) == pi/3", FUNC(acos) (0.5), M_PI_6 * 2.0, + check_eps ("acos (0.5) == pi/3", FUNC(acos) (0.5), M_PI_6l * 2.0, CHOOSE (1e-18, 0, 0)); - check_eps ("acos (-0.5) == 2*pi/3", FUNC(acos) (-0.5), M_PI_6 * 4.0, + check_eps ("acos (-0.5) == 2*pi/3", FUNC(acos) (-0.5), M_PI_6l * 4.0, CHOOSE (1e-17, 0, 0)); check_eps ("acos (0.7) == 0.795398830...", FUNC(acos) (0.7), @@ -895,12 +895,12 @@ asin_test (void) check ("asin (0) == 0", FUNC(asin) (0), 0); check ("asin (-0) == -0", FUNC(asin) (minus_zero), minus_zero); - check_eps ("asin (0.5) == pi/6", FUNC(asin) (0.5), M_PI_6, + check_eps ("asin (0.5) == pi/6", FUNC(asin) (0.5), M_PI_6l, CHOOSE(3.5e-18, 0, 2e-7)); - check_eps ("asin (-0.5) == -pi/6", FUNC(asin) (-0.5), -M_PI_6, + check_eps ("asin (-0.5) == -pi/6", FUNC(asin) (-0.5), -M_PI_6l, CHOOSE(3.5e-18, 0, 2e-7)); - check ("asin (1.0) == pi/2", FUNC(asin) (1.0), M_PI_2); - check ("asin (-1.0) == -pi/2", FUNC(asin) (-1.0), -M_PI_2); + check ("asin (1.0) == pi/2", FUNC(asin) (1.0), M_PI_2l); + check ("asin (-1.0) == -pi/2", FUNC(asin) (-1.0), -M_PI_2l); check_eps ("asin (0.7) == 0.775397496...", FUNC(asin) (0.7), 0.7753974966107530637L, CHOOSE(7e-17L, 2e-16, 0)); } @@ -928,12 +928,12 @@ atan_test (void) check ("atan (0) == 0", FUNC(atan) (0), 0); check ("atan (-0) == -0", FUNC(atan) (minus_zero), minus_zero); - check ("atan (+inf) == pi/2", FUNC(atan) (plus_infty), M_PI_2); - check ("atan (-inf) == -pi/2", FUNC(atan) (minus_infty), -M_PI_2); + check ("atan (+inf) == pi/2", FUNC(atan) (plus_infty), M_PI_2l); + check ("atan (-inf) == -pi/2", FUNC(atan) (minus_infty), -M_PI_2l); - check_eps ("atan (1) == pi/4", FUNC(atan) (1), M_PI_4, + check_eps ("atan (1) == pi/4", FUNC(atan) (1), M_PI_4l, CHOOSE (1e-18, 0, 0)); - check_eps ("atan (-1) == -pi/4", FUNC(atan) (1), M_PI_4, + check_eps ("atan (-1) == -pi/4", FUNC(atan) (1), M_PI_4l, |
