diff options
author | Ben Pfaff <blp@gnu.org> | 2009-09-06 17:17:41 +0200 |
---|---|---|
committer | Bruno Haible <bruno@clisp.org> | 2009-09-06 17:19:55 +0200 |
commit | 598580519cc391a0856e5ff7a15c1634d0ad29bc (patch) | |
tree | 15c5abce9eb7f2d3a768259b64530cabf03b1742 /m4/strtok_r.m4 | |
parent | f0a1525ce8bcfb464598465cc6fea36a706c5f44 (diff) | |
download | gnulib-598580519cc391a0856e5ff7a15c1634d0ad29bc.tar.gz |
Work around a glibc bug in strtok_r.
Diffstat (limited to 'm4/strtok_r.m4')
-rw-r--r-- | m4/strtok_r.m4 | 52 |
1 files changed, 50 insertions, 2 deletions
diff --git a/m4/strtok_r.m4 b/m4/strtok_r.m4 index b79c2eeee1..fd52317144 100644 --- a/m4/strtok_r.m4 +++ b/m4/strtok_r.m4 @@ -1,4 +1,4 @@ -# strtok_r.m4 serial 8 +# strtok_r.m4 serial 9 dnl Copyright (C) 2002, 2003, 2004, 2007, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -10,7 +10,55 @@ AC_DEFUN([gl_FUNC_STRTOK_R], AC_REQUIRE([AC_C_RESTRICT]) AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) - AC_REPLACE_FUNCS([strtok_r]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_CHECK_FUNCS([strtok_r]) + if test $ac_cv_func_strtok_r = yes; then + dnl glibc 2.7 has a bug in strtok_r that causes a segmentation fault + dnl when the second argument to strtok_r is a constant string that has + dnl exactly one byte and compiling with optimization. This bug is, for + dnl example, present in the glibc 2.7-18 package in Debian "lenny". + dnl See <http://sources.redhat.com/bugzilla/show_bug.cgi?id=5614>. + AC_CACHE_CHECK([whether strtok_r works], [gl_cv_func_strtok_r_works], + [AC_RUN_IFELSE( + [AC_LANG_PROGRAM([[ + #ifndef __OPTIMIZE__ + # define __OPTIMIZE__ 1 + #endif + #undef __OPTIMIZE_SIZE__ + #undef __NO_INLINE__ + #include <stdio.h> + #include <string.h> + ]], + [[char delimiters[] = "xxxxxxxx"; + char *save_ptr = (char *) 0xd0d0; + strtok_r (delimiters, "x", &save_ptr); + strtok_r (NULL, "x", &save_ptr); + return 0; + ]]) + ], + [gl_cv_func_strtok_r_works=yes], + [gl_cv_func_strtok_r_works=no], + [ +changequote(,)dnl + case "$host_os" in + # Guess no on glibc systems. + *-gnu*) gl_cv_func_strtok_r_works="guessing no";; + *) gl_cv_func_strtok_r_works="guessing yes";; + esac +changequote([,])dnl + ]) + ]) + case "$gl_cv_func_strtok_r_works" in + *no) + dnl We could set REPLACE_STRTOK_R=1 and AC_LIBOBJ([strtok_r]) here, + dnl but it's only the macro version in <bits/string2.h> which is wrong. + dnl The code compiled into libc is fine. + UNDEFINE_STRTOK_R=1 + ;; + esac + else + AC_LIBOBJ([strtok_r]) + fi AC_CHECK_DECLS_ONCE([strtok_r]) if test $ac_cv_have_decl_strtok_r = no; then HAVE_DECL_STRTOK_R=0 |