mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-14 01:50:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix filesystem::canonical on Solaris 10.

Browse Source 
PR libstdc++/67173
	* src/filesystem/ops.cc (filesystem::canonical): Allocate buffer for
	realpath on Solaris 10.

From-SVN: r227689
This commit is contained in:
Jonathan Wakely 2015-09-11 15:20:32 +01:00 committed by Jonathan Wakely
parent 42b6aad9ef
commit 7c928f726d
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libstdc++-v3/ChangeLog
View File

@ -1,5 +1,9 @@
2015-09-11 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/67173
* src/filesystem/ops.cc (filesystem::canonical): Allocate buffer for
realpath on Solaris 10.
PR libstdc++/65142
* src/c++11/random.cc (random_device::_M_getval()): Check read result.

7
libstdc++-v3/src/filesystem/ops.cc
View File

@ -28,6 +28,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <errno.h>
#include <limits.h> // PATH_MAX
#ifdef _GLIBCXX_HAVE_UNISTD_H
# include <unistd.h>
# if defined(_GLIBCXX_HAVE_SYS_STAT_H) && defined(_GLIBCXX_HAVE_SYS_TYPES_H)
@ -97,7 +98,11 @@ fs::canonical(const path& p, const path& base, error_code& ec)
{
path can;
#ifdef _GLIBCXX_USE_REALPATH
if (char_ptr rp = char_ptr{::realpath(absolute(p, base).c_str(), nullptr)})
char* buffer = nullptr;
#if defined(__SunOS_5_10) && defined(PATH_MAX)
buffer = (char*)::malloc(PATH_MAX);
#endif
if (char_ptr rp = char_ptr{::realpath(absolute(p, base).c_str(), buffer)})
{
can.assign(rp.get());
ec.clear();