diff options
author | Ulrich Drepper <drepper@redhat.com> | 1998-02-10 20:06:30 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1998-02-10 20:06:30 +0000 |
commit | da2d1bc5adf49352232ad0514e79fbd5dcae08e8 (patch) | |
tree | bffb8f62b807428c34d8b2684881013c4172e947 /misc | |
parent | eca3eb3b9cab56dfb95ab2890b4077b98d8c12de (diff) | |
download | glibc-da2d1bc5adf49352232ad0514e79fbd5dcae08e8.tar.gz glibc-da2d1bc5adf49352232ad0514e79fbd5dcae08e8.tar.xz glibc-da2d1bc5adf49352232ad0514e79fbd5dcae08e8.zip |
Update.
1998-02-10 23:57 Ulrich Drepper <drepper@happy.cygnus.com> * misc/tst-efgcvt.c: Add more tests. * misc/efgcvt_r.c: Correct result for above new tests. 1998-02-06 17:22 H.J. Lu <hjl@gnu.org> * misc/efgcvt_r.c (fcvt_r, ecvt_r): Correctly handle NDIGIT <= 0. 1998-02-10 16:48 Philip Blundell <pb@nexus.co.uk> * Makerules (install-no-libc.a-nosubdir): Don't install-bin (etc) if the programs weren't built. 1998-02-09 10:12 Philip Blundell <pb@nexus.co.uk> * sysdeps/libm-ieee754/s_exp2.c (__ieee754_exp2): If we don't have FE_TONEAREST, soldier on regardless and do the best we can. * sysdeps/libm-ieee754/s_exp2f.c (__ieee754_exp2f): likewise. 1998-02-5 17:20 Philip Blundell <pb@nexus.co.uk> * sysdeps/standalone/filedesc.h: Define __need_FOPEN_MAX, not _STDIO_H, before including <bits/stdio_lim.h>. * sysdeps/standalone/arm/bits/errno.h (EOVERFLOW): Added. * io/fts.c (fts_build): Don't try to use d_type if it doesn't exist. * sysdeps/arm/sys/ucontext.h: New file. 1998-02-04 10:11 Philip Blundell <pb@nexus.co.uk> * manual/stdio.texi (Formatted Output Functions): Explicitly say that the return value from snprintf() does not count the terminating NUL as a character. 1998-02-10 16:57 Ulrich Drepper <drepper@happy.cygnus.com> * manual/users.texi: Rewrite to describe correct POSIX behaviour, add description for sete[ug]id and general cleanup. Patch by Zack Weinberg <zack@rabi.phys.columbia.edu>. 1998-01-04 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Makefile (parent-clean): Don't remove makefile fragments here. (postclean): New variable. (clean): Remove makefile fragments here. (realclean distclean): Likewise. Pass sysdep-subdirs to sub-make. (generated): Add isomac and isomanc.out. * Makeconfig ($(common-objpfx)soversions.mk): Don't generate if avoid-generated is set. (postclean-generated): Add soversion.mk. ($(common-objpfx)version.mk): Don't include if avoid-generated is set. * Makerules: Still need to include $(+sysdir_pfx)sysd-Makefile if avoid-generated is set. (common-generated): Add libc.so and libc.so$(libc.so-version). (generated): Add versioned libraries. (common-mostlyclean): Also remove %.so and %_pic.a. * csu/Makefile (generated): Add abi-tag.h. * db2/Makefile (extra-objs): Add getlong.o. * elf/Makefile (generated): Add ld.so, ldd and $(rtld-installed-name). (others): Add ldconfig here instead of ldconfig.o to extra-objs. * malloc/Makefile (generated): Add mtrace. * po/Makefile: Don't include version.mk, not needed any more. * sunrpc/Makefile (generated): Add rpc-proto.d and rpcgen. * sysdeps/unix/Makefile: Fix local_lim.h -> bits/local_lim.h, syscall.h -> sys/syscall.h. (common-generated): Add s-proto.d. (postclean-generated): Add sysd-syscalls. * localedata/Makefile (test-output): Add all output files. (generated): Add test-input and test-output. (generated-dirs): Add all the dirs. 1998-01-04 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Makefile (test-output, generated, generated-dirs): New variables. 1998-02-10 16:57 Ulrich Drepper <drepper@happy.cygnus.com> * resolv/nss_dns/dns-host.c: Various code cleanups. 1998-02-09 08:10 H.J. Lu <hjl@gnu.org> * resolv/gethnamaddr.c (getanswer): Fix the PTR/CNAME bug. From Philip Blundell <pb@nexus.co.uk>. * resolv/nss_dns/dns-host.c (getanswer_r): Ditto. 1998-02-08 Andreas Jaeger <aj@arthur.rhein-neckar.de> * libc.map: Add .rem, .div, .mul, .udiv, .umul, .urem for Sparc. Suggested by debian/sparc porters. 1998-02-07 Andreas Jaeger <aj@arthur.rhein-neckar.de> * misc/tst-efgcvt.c: Totally rewritten, added a lot of new tests for ecvt and fcvt. 1998-02-10 16:32 Ulrich Drepper <drepper@happy.cygnus.com> * sysdeps/unix/sysv/linux/ptsname.c (__ptsname_r): Use __xstat and __fxstat instead of stat and fstat. Use namespace clean __stpcpy. * signal/signal.h: Always define sigset_t if __need_sigset_t is defined even if __USE_POSIX is not defined. 1998-02-02 20:51 Zack Weinberg <zack@rabi.phys.columbia.edu> * sysdeps/unix/sysv/linux/ptsname.c (__ptsname_r): Correct last patch to support obsolete tty major numbers correctly. 1998-02-02 08:47 H.J. Lu <hjl@gnu.org> * login/Makefile ($(inst_libexecdir)/pt_chown): Make the target directory first and ignore install error. * sysdeps/unix/sysv/linux/ptsname.c (__ptsname_r): Substract 128 from ptyno and fix a typo for the BSD style pty. 1998-02-01 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/Makefile ($(common-objpfx)s-proto.d): Depend on all syscalls.list's. 1998-02-01 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/Makefile (sysdep_routines): Add getresuid and getresgid. * sysdeps/unix/sysv/linux/getresuid.c: New file. * sysdeps/unix/sysv/linux/getresgid.c: New file. * sysdeps/unix/sysv/linux/syscalls.list: Remove getres[ug]id, add s_getres[ug]id. * sysdeps/unix/sysv/linux/alpha/syscalls.list: Add getres[ug]id. * sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list: Likewise. * sysdeps/unix/sysv/linux/mips/syscalls.list: Likewise. * sysdeps/unix/sysv/linux/powerpc/syscalls.list: Likewise. 1998-02-02 08:11 H.J. Lu <hjl@gnu.org> * nscd/grpcache.c: Include <stdlib.h>. 1998-02-01 16:01 H.J. Lu <hjl@gnu.org> * stdlib/atoll.c: Fix comments. * sysdeps/posix/ttyname.c: Ignore stdin/stdout/stderr. * sysdeps/posix/ttyname_r.c: Ditto. 1998-02-03 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * io/sys/stat.h: Define S_IFLNK and S_IFSOCK if __USE_BSD or __USE_MISC, independent of __USE_UNIX98. 1998-02-10 19:18 Ulrich Drepper <drepper@happy.cygnus.com> * sysdeps/unix/sysv/linux/i386/sigaction.c (__libc_missing_rt_sigs): Rename from __libc_have_rt_sigs and leave as COMMON data. 1998-02-04 11:58 Richard Henderson <rth@twiddle.rth.home> * Makeconfig (CFLAGS-.os): Kill -fno-common. * Makerules (libc.so): Prelink libc_pic.a, allocating commons. * libc.map (GLIBC_2.1): Add Linux/Alpha tv64 symbols. * elf/rtld.map: New file. Needed to define the GLIBC_2.* version symbols. * include/libc-symbols.h (symbol_version, default_symbol_version): Provide asm versions and correct !DO_VERSIONING versions. * sysdeps/unix/make-syscalls.sh: Recognize version symbols in the weak symbol list. * sysdeps/unix/sysv/linux/sigaction.c (__libc_missing_rt_sigs): Rename from __libc_have_rt_sigs and leave as COMMON data. * sysdeps/unix/sysv/linux/sigpending.c: Likewise. * sysdeps/unix/sysv/linux/sigprocmask.c: Likewise. * sysdeps/unix/sysv/linux/sigsuspend.c: Likewise. 1998-02-04 16:41 Zack Weinberg <zack@rabi.phys.columbia.edu> * sunrpc/Makefile: Correct dependencies of rpcgen. 1998-02-10 03:00 Ulrich Drepper <drepper@happy.cygnus.com> * nscd/Makefile: Fix test for available linuxthreads add-on. Patch by Zack Weinberg <zack@rabi.phys.columbia.edu>. 1998-02-05 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/unix/sysv/linux/syscalls.list: Fix typo in lchown. 1998-02-03 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/gnu/Makefile: Respect with-cvs variable. * manual/errno.texi (Error Messages): Correct description of strerror_r. Pointed out by jonas@bagge.se. 1998-01-29 Andreas Jaeger <aj@arthur.rhein-neckar.de> * manual/socket.texi (Host Address Functions): Clarify description of inet_network. 1998-02-07 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/grantpt.c (argv): Move const to toplevel. (grantpt): Delete superfluous cast. 1998-02-06 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Makefile ($(inst_slibdir)/libc-$(version).so): Depend on elf/ldso_install instead of elf/subdir_install. (elf/ldso_install): New target. * elf/Makefile (ldso_install): New target. 1998-02-07 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/powerpc/socket.S: Really do the change of 1998-01-06. 1998-02-07 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * string/bits/string2.h (strcmp): Use __string2_1bptr_p only for constant expressions. 1998-02-07 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * nss/test-netdb.c: Include <unistd.h> for gethostname and "nss.h" for __nss_configure_lookup. (output_hostent): Remove unused variable. 1998-02-07 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * string/tst-inlcall.c: Fix format string. 1998-02-09 Andreas Jaeger <aj@arthur.rhein-neckar.de> * inet/netinet/in.h: Rename second parameter of bindresvport to avoid buggy gcc warning. [PR libc/412]
Diffstat (limited to 'misc')
-rw-r--r-- | misc/efgcvt_r.c | 56 | ||||
-rw-r--r-- | misc/tst-efgcvt.c | 112 |
2 files changed, 147 insertions, 21 deletions
diff --git a/misc/efgcvt_r.c b/misc/efgcvt_r.c index 2dd0c9f02a..f6bd98888b 100644 --- a/misc/efgcvt_r.c +++ b/misc/efgcvt_r.c @@ -23,6 +23,7 @@ #include <ctype.h> #include <math.h> #include <stdlib.h> +#include <sys/param.h> #ifndef FLOAT_TYPE #define FLOAT_TYPE double @@ -60,19 +61,20 @@ APPEND (FUNC_PREFIX, fcvt_r) (value, ndigit, decpt, sign, buf, len) *sign = signbit (value) != 0; if (*sign) value = -value; + + if (ndigit < 0) + { + /* Rounding to the left of the decimal point. */ + for (i = ndigit; i < 0; i++) + value *= 0.1; + + ndigit = 0; + } } else /* Value is Inf or NaN. */ *sign = 0; - if (ndigit <= 0) - { - if (len > 0) - buf[0] = '\0'; - *decpt = 0; - return 0; - } - n = snprintf (buf, len, "%.*" FLOAT_FMT_FLAG "f", ndigit, value); if (n < 0) return -1; @@ -91,8 +93,21 @@ APPEND (FUNC_PREFIX, fcvt_r) (value, ndigit, decpt, sign, buf, len) do ++i; while (i < n && !isdigit (buf[i])); - memmove (&buf[*decpt], &buf[i], n - i); - buf[n - (i - *decpt)] = '\0'; + + if (*decpt == 1 && buf[0] == '0') + { + /* We must not have leading zeroes. Strip them all out and + adjust *DECPT if necessary. */ + --*decpt; + while (i < n && buf[i] == '0') + { + --*decpt; + ++i; + } + } + + memmove (&buf[MAX (*decpt, 0)], &buf[i], n - i); + buf[n - (i - MAX (*decpt, 0))] = '\0'; } return 0; @@ -136,7 +151,7 @@ APPEND (FUNC_PREFIX, ecvt_r) (value, ndigit, decpt, sign, buf, len) do { d *= 10.0; - exponent--; + --exponent; } while (d < 1.0); } @@ -145,7 +160,7 @@ APPEND (FUNC_PREFIX, ecvt_r) (value, ndigit, decpt, sign, buf, len) do { d *= 0.1; - exponent++; + ++exponent; } while (d >= 10.0); } @@ -155,9 +170,22 @@ APPEND (FUNC_PREFIX, ecvt_r) (value, ndigit, decpt, sign, buf, len) value = d; } } + else if (value == 0.0) + /* SUSv2 leaves it unspecified whether *DECPT is 0 or 1 for 0.0. + This could be changed to -1 if we want to return 0. */ + exponent = 0; + + if (ndigit <= 0 && len > 0) + { + buf[0] = '\0'; + *decpt = 1; + *sign = isfinite (value) ? signbit (value) != 0 : 0; + } + else + if (APPEND (FUNC_PREFIX, fcvt_r) (value, ndigit - 1, decpt, sign, + buf, len)) + return -1; - if (APPEND (FUNC_PREFIX, fcvt_r) (value, ndigit - 1, decpt, sign, buf, len)) - return -1; *decpt += exponent; return 0; } diff --git a/misc/tst-efgcvt.c b/misc/tst-efgcvt.c index 537f6da8a6..65c588badd 100644 --- a/misc/tst-efgcvt.c +++ b/misc/tst-efgcvt.c @@ -16,19 +16,117 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef _GNU_SOURCE +# define _GNU_SOURCE 1 +#endif + +#include <math.h> #include <stdio.h> #include <stdlib.h> -int -main (void) +int error_count; + +typedef struct +{ + double value; + int ndigit; + int decpt; + char result[30]; +} testcase; + +typedef char * ((*efcvt_func) (double, int, int *, int *)); + + +static testcase ecvt_tests[] = +{ + { 0.0, 0, 1, "" }, + { 10.0, 0, 2, "" }, + { 10.0, 1, 2, "1" }, + { 10.0, 5, 2, "10000" }, + { -12.0, 5, 2, "12000" }, + { 0.2, 4, 0, "2000" }, + { 0.02, 4, -1, "2000" }, + { 5.5, 1, 1, "6" }, + { 1.0, -1, 1, "" }, + { 0.01, 2, -1, "10" }, + /* -1.0 is end marker. */ + { -1.0, 0, 0, "" } +}; + +static testcase fcvt_tests[] = +{ + { 0.0, 0, 1, "0" }, + { 10.0, 0, 2, "10" }, + { 10.0, 1, 2, "100" }, + { 10.0, 4, 2, "100000" }, + { -12.0, 5, 2, "1200000" }, + { 0.2, 4, 0, "2000" }, + { 0.02, 4, -1, "200" }, + { 5.5, 1, 1, "55" }, + { 5.5, 0, 1, "6" }, + { 0.01, 2, -1, "1" }, + /* -1.0 is end marker. */ + { -1.0, 0, 0, "" } +}; + +void +output_error (const char *name, double value, int ndigit, + const char *exp_p, int exp_decpt, int exp_sign, + char *res_p, int res_decpt, int res_sign) +{ + printf ("%s returned wrong result for value: %f, ndigits: %d\n", + name, value, ndigit); + printf ("Result was p: \"%s\", decpt: %d, sign: %d\n", + res_p, res_decpt, res_sign); + printf ("Should be p: \"%s\", decpt: %d, sign: %d\n", + exp_p, exp_decpt, exp_sign); + ++error_count; +} + +void +test (testcase tests[], efcvt_func efcvt, const char *name) +{ + int no = 0; + int decpt, sign; + char *p; + + while (tests[no].value != -1.0) + { + p = efcvt (tests[no].value, tests[no].ndigit, &decpt, &sign); + if (decpt != tests[no].decpt + || sign != (tests[no].value < 0) + || strcmp (p, tests[no].result) != 0) + output_error (name, tests[no].value, tests[no].ndigit, + tests[no].result, tests[no].decpt, + (tests[no].value < 0), + p, decpt, sign); + ++no; + } +} + +void +special (void) { int decpt, sign; char *p; - p = ecvt (0.0, 0, &decpt, &sign); - printf ("p: \"%s\", decpt: %d, sign: %d\n", p, decpt, sign); - if (p[0] != '\0') - return 1; + p = ecvt (NAN, 10, &decpt, &sign); + if (sign != 0 || strcmp (p, "nan") != 0) + output_error ("ecvt", NAN, 10, "nan", 0, 0, p, decpt, sign); - return 0; + p = ecvt (INFINITY, 10, &decpt, &sign); + if (sign != 0 || strcmp (p, "inf") != 0) + output_error ("ecvt", NAN, 10, "inf", 0, 0, p, decpt, sign); + +} + + +int +main (void) +{ + test (ecvt_tests, ecvt, "ecvt"); + test (fcvt_tests, fcvt, "fcvt"); + special (); + + return error_count; } |