aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog23
-rw-r--r--math/libm-test.inc4
-rw-r--r--posix/Makefile3
-rw-r--r--posix/bug-regex4.c60
-rw-r--r--posix/regex.c8
-rw-r--r--sysdeps/i386/fpu/libm-test-ulps15
6 files changed, 108 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 8529ae5..825ff5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2001-05-14 Andreas Jaeger <aj@suse.de>
+
+ * sysdeps/i386/fpu/libm-test-ulps: Adjust for new tests.
+
+ * math/libm-test.inc (tanh_test): Add testcases for last tanh bug.
+
+2001-05-14 Stephen L Moshier <moshier@mediaone.net>
+
+ * sysdeps/ieee754/ldbl-96/s_tanhl.c (__tanhl): Fix sign test.
+
+2001-05-11 Jakub Jelinek <jakub@redhat.com>
+
+ * posix/regex.c (re_match_2_internal): Swap mbs_offset and csize
+ as well if swapping strings.
+ Make sure stop is not past end of second string.
+ * posix/bug-regex4.c: New test.
+ * posix/Makefile (tests): Add bug-regex4.
+
+2001-05-10 Andreas Jaeger <aj@suse.de>
+
+ * manual/install.texi (Linux): Clarify that Linux 2.2 is minimal
+ requirement.
+
2001-05-12 Andreas Jaeger <aj@suse.de>
* sysdeps/ieee754/dbl-64/s_sin.c: Include "math_private.h" for
diff --git a/math/libm-test.inc b/math/libm-test.inc
index be6b1b6..00029ab 100644
--- a/math/libm-test.inc
+++ b/math/libm-test.inc
@@ -3954,6 +3954,10 @@ tanh_test (void)
TEST_f_f (tanh, nan_value, nan_value);
TEST_f_f (tanh, 0.7L, 0.60436777711716349631L);
+ TEST_f_f (tanh, -0.7L, -0.60436777711716349631L);
+
+ TEST_f_f (tanh, 1.0L, 0.7615941559557648881194582826047935904L);
+ TEST_f_f (tanh, -1.0L, -0.7615941559557648881194582826047935904L);
END (tanh);
}
diff --git a/posix/Makefile b/posix/Makefile
index 12211fc..dab29f8 100644
--- a/posix/Makefile
+++ b/posix/Makefile
@@ -69,7 +69,8 @@ tests := tstgetopt testfnm runtests runptests \
tst-preadwrite tst-preadwrite64 test-vfork regexbug1 \
tst-getlogin tst-mmap tst-getaddrinfo tst-truncate \
tst-truncate64 tst-fork tst-fnmatch tst-regexloc tst-dir \
- tst-chmod bug-regex1 bug-regex2 bug-regex3 tst-gnuglob
+ tst-chmod bug-regex1 bug-regex2 bug-regex3 bug-regex4 \
+ tst-gnuglob
ifeq (yes,$(build-shared))
test-srcs := globtest
tests += wordexp-test tst-exec tst-spawn
diff --git a/posix/bug-regex4.c b/posix/bug-regex4.c
new file mode 100644
index 0000000..68da455
--- /dev/null
+++ b/posix/bug-regex4.c
@@ -0,0 +1,60 @@
+/* Test for re_search_2.
+ Copyright (C) 2001 Free Software Foundation, Inc.
+ Contributed by Jakub Jelinek <jakub@redhat.com>, 2001.
+
+ 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 <locale.h>
+#include <stdio.h>
+#include <string.h>
+#include <regex.h>
+
+int
+main (void)
+{
+ struct re_pattern_buffer regex;
+ const char *s;
+ int match[3];
+ int result = 0;
+
+ memset (&regex, '\0', sizeof (regex));
+
+ setlocale (LC_ALL, "C");
+
+ setlocale (LC_ALL, "C");
+ s = re_compile_pattern ("ab[cde]", 7, &regex);
+ if (s != NULL)
+ {
+ puts ("re_compile_pattern return non-NULL value");
+ result = 1;
+ }
+ else
+ {
+ match[0] = re_search_2 (&regex, "xyabez", 6, "", 0, 1, 9, NULL, 10);
+ match[1] = re_search_2 (&regex, NULL, 0, "abc", 3, 0, 3, NULL, 3);
+ match[2] = re_search_2 (&regex, "xya", 3, "bd", 2, 2, 6, NULL, 8);
+ if (match[0] != 2 || match[1] != 0 || match[2] != 2)
+ {
+ printf ("re_match returned %d,%d,%d, expected 2,0,2\n",
+ match[0], match[1], match[2]);
+ result = 1;
+ }
+ else
+ puts (" -> OK");
+ }
+
+ return result;
+}
diff --git a/posix/regex.c b/posix/regex.c
index 471d869..ca46459 100644
--- a/posix/regex.c
+++ b/posix/regex.c
@@ -5595,6 +5595,12 @@ re_match_2_internal (bufp, string1, size1, string2, size2, pos, regs, stop)
size2 = size1;
string1 = 0;
size1 = 0;
+#ifdef MBS_SUPPORT
+ mbs_offset2 = mbs_offset1;
+ csize2 = csize1;
+ mbs_offset1 = NULL;
+ csize1 = 0;
+#endif
}
end1 = string1 + size1;
end2 = string2 + size2;
@@ -5609,6 +5615,8 @@ re_match_2_internal (bufp, string1, size1, string2, size2, pos, regs, stop)
}
else
{
+ if (stop > csize1 + csize2)
+ stop = csize1 + csize2;
end_match_1 = end1;
mcnt = count_mbs_length(mbs_offset2, stop-csize1);
end_match_2 = string2 + mcnt;
diff --git a/sysdeps/i386/fpu/libm-test-ulps b/sysdeps/i386/fpu/libm-test-ulps
index d5460c9..7c60eea 100644
--- a/sysdeps/i386/fpu/libm-test-ulps
+++ b/sysdeps/i386/fpu/libm-test-ulps
@@ -733,14 +733,16 @@ ifloat: 1
ldouble: 1
ildouble: 1
Test "jn (10, -1.0) == 0.26306151236874532070e-9":
+double: 1
float: 1
+idouble: 1
ifloat: 1
ldouble: 1
ildouble: 1
Test "jn (10, 0.1) == 0.26905328954342155795e-19":
-double: 4
+double: 5
float: 2
-idouble: 4
+idouble: 5
ifloat: 2
ldouble: 1
ildouble: 1
@@ -753,6 +755,8 @@ ldouble: 2
ildouble: 2
Test "jn (10, 1.0) == 0.26306151236874532070e-9":
float: 1
+double: 1
+idouble: 1
ifloat: 1
ldouble: 1
ildouble: 1
@@ -932,6 +936,9 @@ idouble: 0.5
Test "tanh (0.7) == 0.60436777711716349631":
ildouble: 521
ldouble: 521
+Test "tanh (-0.7) == -0.60436777711716349631":
+ildouble: 1
+ldouble: 1
# tgamma
Test "tgamma (-0.5) == -2 sqrt (pi)":
@@ -1503,9 +1510,9 @@ ldouble: 2
ildouble: 2
Function: "jn":
-double: 4
+double: 5
float: 2
-idouble: 4
+idouble: 5
ifloat: 2
ldouble: 2
ildouble: 2