Mercurial > hg > octave-shane > gnulib-hg
changeset 17572:eaaa7c775b60
open-tests: port to glibc with _FORTIFY_SOURCE and -O1
Problem reported by Daiki Ueno in:
http://lists.gnu.org/archive/html/bug-gnulib/2013-06/msg00052.html
* tests/test-open.h (__always_inline):
New macro, if not already defined.
(test_open): Use it.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Thu, 05 Dec 2013 09:22:20 -0800 |
| parents | 8e2c4bc82b3e |
| children | 55235a8a0e6f |
| files | ChangeLog tests/test-open.h |
| diffstat | 2 files changed, 19 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2013-12-05 Paul Eggert <eggert@cs.ucla.edu> + + open-tests: port to glibc with _FORTIFY_SOURCE and -O1 + Problem reported by Daiki Ueno in: + http://lists.gnu.org/archive/html/bug-gnulib/2013-06/msg00052.html + * tests/test-open.h (__always_inline): + New macro, if not already defined. + (test_open): Use it. + 2013-12-04 Eric Blake <eblake@redhat.com> include_next: minimize code duplication
--- a/tests/test-open.h +++ b/tests/test-open.h @@ -16,13 +16,22 @@ /* Written by Bruno Haible <bruno@clisp.org>, 2007. */ +/* Make test_open always inline if we're using Fortify, which defines + __always_inline to do that. Do nothing otherwise. This works + around a glibc bug whereby 'open' cannot be used as a function + pointer when _FORTIFY_SOURCE is positive. */ + +#ifndef __always_inline +#define __always_inline +#endif + /* This file is designed to test both open(n,buf[,mode]) and openat(AT_FDCWD,n,buf[,mode]). FUNC is the function to test. Assumes that BASE and ASSERT are already defined, and that appropriate headers are already included. If PRINT, warn before skipping symlink tests with status 77. */ -static int +static int __always_inline test_open (int (*func) (char const *, int, ...), bool print) { int fd;