Commit 43222a5e by Jonathan Wakely Committed by Jonathan Wakely

testsuite_fs.h (nonexistent_path): Use less generic name for paths.

	* testsuite/util/testsuite_fs.h (nonexistent_path): Use less generic
	name for paths. Prefer snprintf to sprintf.

From-SVN: r228416
parent 2671ee45
2015-10-02 Jonathan Wakely <jwakely@redhat.com> 2015-10-02 Jonathan Wakely <jwakely@redhat.com>
* testsuite/util/testsuite_fs.h (nonexistent_path): Use less generic
name for paths. Prefer snprintf to sprintf.
PR libstdc++/67747 PR libstdc++/67747
* src/filesystem/dir.cc (native_readdir): Remove. * src/filesystem/dir.cc (native_readdir): Remove.
(_Dir::advance): Use readdir instead of native_readdir. (_Dir::advance): Use readdir instead of native_readdir.
......
...@@ -73,7 +73,7 @@ namespace __gnu_test ...@@ -73,7 +73,7 @@ namespace __gnu_test
{ {
std::experimental::filesystem::path p; std::experimental::filesystem::path p;
#if defined(_GNU_SOURCE) || _XOPEN_SOURCE >= 500 || _POSIX_C_SOURCE >= 200112L #if defined(_GNU_SOURCE) || _XOPEN_SOURCE >= 500 || _POSIX_C_SOURCE >= 200112L
char tmp[] = "test.XXXXXX"; char tmp[] = "filesystem-ts-test.XXXXXX";
int fd = ::mkstemp(tmp); int fd = ::mkstemp(tmp);
if (fd == -1) if (fd == -1)
throw std::experimental::filesystem::filesystem_error("mkstemp failed", throw std::experimental::filesystem::filesystem_error("mkstemp failed",
...@@ -83,7 +83,11 @@ namespace __gnu_test ...@@ -83,7 +83,11 @@ namespace __gnu_test
p = tmp; p = tmp;
#else #else
char buf[64]; char buf[64];
std::sprintf(buf, "test.%lu", (unsigned long)::getpid()); #if _GLIBCXX_USE_C99
std::snprintf(buf, 64, "filesystem-ts-test.%lu", (unsigned long)::getpid());
#else
std::sprintf(buf, "filesystem-ts-test.%lu", (unsigned long)::getpid());
#endif
p = buf; p = buf;
#endif #endif
return p; return p;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment