aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rwxr-xr-xconfigure2
-rw-r--r--posix/regex.c12
-rw-r--r--sysdeps/unix/sysv/aix/start.c2
4 files changed, 16 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 6e25a8c3dc..72ac0c549d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2001-07-07 Ulrich Drepper <drepper@redhat.com>
+ * posix/regex.c: Limit string length printed in debug messages to
+ 100 chars.
+
* configure.in: Don't warn about versioning if not on ELF system.
2001-07-07 Andreas Jaeger <aj@suse.de>
diff --git a/configure b/configure
index 859e798b07..c873bc70a7 100755
--- a/configure
+++ b/configure
@@ -2680,7 +2680,7 @@ else
fi
-if test $shared != no && test $VERSIONING = no; then
+if test $elf = yes && test $shared != no && test $VERSIONING = no; then
echo "\
*** WARNING: You should not compile GNU libc without versioning. Not using
*** versioning will introduce incompatibilities so that old binaries
diff --git a/posix/regex.c b/posix/regex.c
index cce218de05..77a0758440 100644
--- a/posix/regex.c
+++ b/posix/regex.c
@@ -1182,6 +1182,8 @@ PREFIX(print_double_string) (where, string1, size1, string2, size2)
printf ("(null)");
else
{
+ int cnt;
+
if (FIRST_STRING_P (where))
{
for (this_char = where - string1; this_char < size1; this_char++)
@@ -1190,8 +1192,16 @@ PREFIX(print_double_string) (where, string1, size1, string2, size2)
where = string2;
}
+ cnt = 0;
for (this_char = where - string2; this_char < size2; this_char++)
- PUT_CHAR (string2[this_char]);
+ {
+ PUT_CHAR (string2[this_char]);
+ if (++cnt > 100)
+ {
+ fputs ("...", stdout);
+ break;
+ }
+ }
}
}
diff --git a/sysdeps/unix/sysv/aix/start.c b/sysdeps/unix/sysv/aix/start.c
index 6c784f5dbf..fd4d695eaa 100644
--- a/sysdeps/unix/sysv/aix/start.c
+++ b/sysdeps/unix/sysv/aix/start.c
@@ -31,7 +31,7 @@ typedef unsigned char uchar; /* sb in libc/posix/types.h */
/* The first piece of initialized data. */
int __data_start = 0;
-+#ifndef HAVE_ELF
+#ifndef HAVE_ELF
/* Since gcc/crtstuff.c won't define it unless the ELF format is used
we will need to define it here. */
void *__dso_handle = NULL;