Use mkdtemp where available, avoiding linker warnings about dangerous tempnam
This commit is contained in:
parent
bc9b3f6ff1
commit
04a47dfb8d
@ -130,7 +130,7 @@ check_function_exists(gettimeofday HAVE_GETTIMEOFDAY)
|
|||||||
check_function_exists(ftime HAVE_FTIME)
|
check_function_exists(ftime HAVE_FTIME)
|
||||||
check_function_exists(timegm HAVE_TIMEGM)
|
check_function_exists(timegm HAVE_TIMEGM)
|
||||||
check_function_exists(rint HAVE_RINT)
|
check_function_exists(rint HAVE_RINT)
|
||||||
|
check_function_exists(mkdtemp HAVE_MKDTEMP)
|
||||||
|
|
||||||
if(HAVE_UNISTD_H)
|
if(HAVE_UNISTD_H)
|
||||||
set(CMAKE_REQUIRED_INCLUDES ${CMAKE_INCLUDE_PATH})
|
set(CMAKE_REQUIRED_INCLUDES ${CMAKE_INCLUDE_PATH})
|
||||||
|
@ -18,6 +18,9 @@
|
|||||||
//
|
//
|
||||||
// $Id$
|
// $Id$
|
||||||
|
|
||||||
|
#ifdef HAVE_CONFIG_H
|
||||||
|
# include <simgear_config.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <simgear/misc/sg_dir.hxx>
|
#include <simgear/misc/sg_dir.hxx>
|
||||||
|
|
||||||
@ -74,6 +77,22 @@ Dir Dir::current()
|
|||||||
|
|
||||||
Dir Dir::tempDir(const std::string& templ)
|
Dir Dir::tempDir(const std::string& templ)
|
||||||
{
|
{
|
||||||
|
#ifdef HAVE_MKDTEMP
|
||||||
|
char buf[1024];
|
||||||
|
char* tempPath = ::getenv("TMPDIR");
|
||||||
|
if (!tempPath) {
|
||||||
|
tempPath = "/tmp/";
|
||||||
|
}
|
||||||
|
// Mac OS-X / BSD manual says any number of 'X's, but GLibc manual
|
||||||
|
// says exactly six, so that's what I'm going with
|
||||||
|
::snprintf(buf, 1024, "%s%s-XXXXXX", tempPath, templ.c_str());
|
||||||
|
if (!mkdtemp(buf)) {
|
||||||
|
SG_LOG(SG_IO, SG_WARN, "mkdtemp failed:" << strerror(errno));
|
||||||
|
return Dir();
|
||||||
|
}
|
||||||
|
|
||||||
|
return Dir(SGPath(buf));
|
||||||
|
#else
|
||||||
SGPath p(tempnam(0, templ.c_str()));
|
SGPath p(tempnam(0, templ.c_str()));
|
||||||
Dir t(p);
|
Dir t(p);
|
||||||
if (!t.create(0700)) {
|
if (!t.create(0700)) {
|
||||||
@ -81,6 +100,7 @@ Dir Dir::tempDir(const std::string& templ)
|
|||||||
}
|
}
|
||||||
|
|
||||||
return t;
|
return t;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
PathList Dir::children(int types, const std::string& nameFilter) const
|
PathList Dir::children(int types, const std::string& nameFilter) const
|
||||||
|
@ -11,6 +11,7 @@
|
|||||||
#cmakedefine HAVE_TIMEGM
|
#cmakedefine HAVE_TIMEGM
|
||||||
#cmakedefine HAVE_ISNAN
|
#cmakedefine HAVE_ISNAN
|
||||||
#cmakedefine HAVE_WINDOWS_H
|
#cmakedefine HAVE_WINDOWS_H
|
||||||
|
#cmakedefine HAVE_MKDTEMP
|
||||||
|
|
||||||
#cmakedefine HAVE_SVN_CLIENT_H
|
#cmakedefine HAVE_SVN_CLIENT_H
|
||||||
#cmakedefine HAVE_LIBSVN_CLIENT_1
|
#cmakedefine HAVE_LIBSVN_CLIENT_1
|
||||||
|
Loading…
Reference in New Issue
Block a user