Re: [PATCH] Windows support for std::filesystem
niXman 2017-02-12 20:28:
Hi,
Tested on i686/x86_64-MinGW-W64
Please test possible regressions on posix platform.
As continuation for:
https://gcc.gnu.org/ml/libstdc++/2017-02/msg00041.html
Regression on posix platform was fixed.
Tested on i686/x86_64-MinGW-W64 and x86_64-linux-gnu.
Index: libstdc++-v3/src/filesystem/dir.cc
===
--- libstdc++-v3/src/filesystem/dir.cc (revision 246136)
+++ libstdc++-v3/src/filesystem/dir.cc (working copy)
@@ -41,9 +41,10 @@
#endif
#ifdef _GLIBCXX_FILESYSTEM_IS_WINDOWS
-# undef opendir
-# define opendir _wopendir
-#endif
+# include "fs-win32.h"
+#else
+# include "fs-posix.h"
+#endif // _GLIBCXX_FILESYSTEM_IS_WINDOWS
namespace fs = std::experimental::filesystem;
@@ -51,7 +52,7 @@
{
_Dir() : dirp(nullptr) { }
- _Dir(DIR* dirp, const fs::path& path) : dirp(dirp), path(path) { }
+ _Dir(os_DIR_t* dirp, const fs::path& path) : dirp(dirp), path(path) { }
_Dir(_Dir&& d)
: dirp(std::exchange(d.dirp, nullptr)), path(std::move(d.path)),
@@ -60,11 +61,11 @@
_Dir& operator=(_Dir&&) = delete;
- ~_Dir() { if (dirp) ::closedir(dirp); }
+ ~_Dir() { if (dirp) ::os_closedir(dirp); }
bool advance(std::error_code*, directory_options = directory_options::none);
- DIR* dirp;
+ os_DIR_t* dirp;
fs::path path;
directory_entry entry;
file_type type = file_type::none;
@@ -87,7 +88,7 @@
if (ec)
ec->clear();
-if (DIR* dirp = ::opendir(p.c_str()))
+if (os_DIR_t* dirp = ::os_opendir(p.c_str()))
return {dirp, p};
const int err = errno;
@@ -105,7 +106,7 @@
}
inline fs::file_type
- get_file_type(const ::dirent& d __attribute__((__unused__)))
+ get_file_type(const ::os_dirent_t& d __attribute__((__unused__)))
{
#ifdef _GLIBCXX_HAVE_STRUCT_DIRENT_D_TYPE
switch (d.d_type)
@@ -145,13 +146,14 @@
ec->clear();
int err = std::exchange(errno, 0);
- const auto entp = readdir(dirp);
+ const auto entp = ::os_readdir(dirp);
std::swap(errno, err);
if (entp)
{
// skip past dot and dot-dot
- if (!strcmp(entp->d_name, ".") || !strcmp(entp->d_name, ".."))
+ if (!std::char_traits::compare(entp->d_name, _WS("."), 1) ||
+ !std::char_traits::compare(entp->d_name, _WS(".."), 2))
return advance(ec, options);
entry = fs::directory_entry{path / entp->d_name};
type = get_file_type(*entp);
@@ -239,7 +241,7 @@
error_code* ec)
: _M_options(options), _M_pending(true)
{
- if (DIR* dirp = ::opendir(p.c_str()))
+ if (os_DIR_t* dirp = ::os_opendir(p.c_str()))
{
auto sp = std::make_shared<_Dir_stack>();
sp->push(_Dir{ dirp, p });
Index: libstdc++-v3/src/filesystem/fs-posix.h
===
--- libstdc++-v3/src/filesystem/fs-posix.h (revision 0)
+++ libstdc++-v3/src/filesystem/fs-posix.h (working copy)
@@ -0,0 +1,49 @@
+
+// Copyright (C) 2014-2017 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library. This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// Under Section 7 of GPL version 3, you are granted additional
+// permissions described in the GCC Runtime Library Exception, version
+// 3.1, as published by the Free Software Foundation.
+
+// You should have received a copy of the GNU General Public License and
+// a copy of the GCC Runtime Library Exception along with this program;
+// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
+//
[PATCH] Windows support for std::filesystem
Hi,
Tested on i686/x86_64-MinGW-W64
Please test possible regressions on posix platform.
--
Regards, niXman
___
Dual-target(32 & 64-bit) MinGW-W64 compilers for 32 and 64-bit Windows:
https://sf.net/p/mingw-w64/
Index: libstdc++-v3/src/filesystem/dir.cc
===
--- libstdc++-v3/src/filesystem/dir.cc (revision 245367)
+++ libstdc++-v3/src/filesystem/dir.cc (working copy)
@@ -41,9 +41,10 @@
#endif
#ifdef _GLIBCXX_FILESYSTEM_IS_WINDOWS
-# undef opendir
-# define opendir _wopendir
-#endif
+# include "fs-win32.h"
+#else
+# include "fs-posix.h"
+#endif // _GLIBCXX_FILESYSTEM_IS_WINDOWS
namespace fs = std::experimental::filesystem;
@@ -51,7 +52,7 @@
{
_Dir() : dirp(nullptr) { }
- _Dir(DIR* dirp, const fs::path& path) : dirp(dirp), path(path) { }
+ _Dir(os_DIR_t* dirp, const fs::path& path) : dirp(dirp), path(path) { }
_Dir(_Dir&& d)
: dirp(std::exchange(d.dirp, nullptr)), path(std::move(d.path)),
@@ -60,11 +61,11 @@
_Dir& operator=(_Dir&&) = delete;
- ~_Dir() { if (dirp) ::closedir(dirp); }
+ ~_Dir() { if (dirp) ::os_closedir(dirp); }
bool advance(std::error_code*, directory_options = directory_options::none);
- DIR* dirp;
+ os_DIR_t* dirp;
fs::path path;
directory_entry entry;
file_type type = file_type::none;
@@ -87,7 +88,7 @@
if (ec)
ec->clear();
-if (DIR* dirp = ::opendir(p.c_str()))
+if (os_DIR_t* dirp = ::os_opendir(p.c_str()))
return {dirp, p};
const int err = errno;
@@ -105,7 +106,7 @@
}
inline fs::file_type
- get_file_type(const ::dirent& d __attribute__((__unused__)))
+ get_file_type(const ::os_dirent_t& d __attribute__((__unused__)))
{
#ifdef _GLIBCXX_HAVE_STRUCT_DIRENT_D_TYPE
switch (d.d_type)
@@ -145,13 +146,14 @@
ec->clear();
int err = std::exchange(errno, 0);
- const auto entp = readdir(dirp);
+ const auto entp = ::os_readdir(dirp);
std::swap(errno, err);
if (entp)
{
// skip past dot and dot-dot
- if (!strcmp(entp->d_name, ".") || !strcmp(entp->d_name, ".."))
+ if (!std::char_traits::compare(entp->d_name, _WS("."), 1) ||
+ !std::char_traits::compare(entp->d_name, _WS(".."), 2))
return advance(ec, options);
entry = fs::directory_entry{path / entp->d_name};
type = get_file_type(*entp);
@@ -239,7 +241,7 @@
error_code* ec)
: _M_options(options), _M_pending(true)
{
- if (DIR* dirp = ::opendir(p.c_str()))
+ if (os_DIR_t* dirp = ::os_opendir(p.c_str()))
{
auto sp = std::make_shared<_Dir_stack>();
sp->push(_Dir{ dirp, p });
Index: libstdc++-v3/src/filesystem/fs-posix.h
===
--- libstdc++-v3/src/filesystem/fs-posix.h (nonexistent)
+++ libstdc++-v3/src/filesystem/fs-posix.h (working copy)
@@ -0,0 +1,49 @@
+
+// Copyright (C) 2014-2017 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library. This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// Under Section 7 of GPL version 3, you are granted additional
+// permissions described in the GCC Runtime Library Exception, version
+// 3.1, as published by the Free Software Foundation.
+
+// You should have received a copy of the GNU General Public License and
+// a copy of the GCC Runtime Library Exception along with this program;
+// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
+//
