From 2c7da872aa769be9282e77589d97024ec1f8a4bf Mon Sep 17 00:00:00 2001 From: Ed Schouten Date: Wed, 8 Jun 2016 20:54:56 +0000 Subject: [PATCH] Don't let ATF call basename() and dirname() in a non-standard way. POSIX basename() and dirname() are allowed to overwrite the input buffer. The advantage of implementing it that way is that the functions can be thread-safe, as they don't store the result in a global buffer. It looks like ATF wants to call basename() and dirname() in the non-standard way where the argument is of type "const char *". This change disables the calls to basename() and dirname(), which only seems to affect the formatting of some rare debug/error messages. Reviewed by: ngie Differential Revision: https://reviews.freebsd.org/D6627 --- contrib/atf/config.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/atf/config.h b/contrib/atf/config.h index befc2e3d9f23..a7094fca78cd 100644 --- a/contrib/atf/config.h +++ b/contrib/atf/config.h @@ -2,10 +2,10 @@ /* config.h.in. Generated from configure.ac by autoheader. */ /* Define to 1 if basename takes a constant pointer */ -#define HAVE_CONST_BASENAME 1 +/* #undef HAVE_CONST_BASENAME */ /* Define to 1 if dirname takes a constant pointer */ -#define HAVE_CONST_DIRNAME 1 +/* #undef HAVE_CONST_DIRNAME */ /* Define to 1 if you have the header file. */ #define HAVE_DLFCN_H 1