Moved some common Windows utilities to a separate header.

This is to fix compilation on Windows as directory iterators implementation
also need to construct permissions mask.

src/directory.cpp

@@ -41,8 +41,6 @@
 #include <boost/assert.hpp>
 #include <boost/system/error_code.hpp>
 
-#include "error_handling.hpp"
-
 #ifdef BOOST_POSIX_API
 
 #include <dirent.h>
@@ -64,8 +62,12 @@
 #include <cwchar>
 #include <windows.h>
 
+#include "windows_tools.hpp"
+
 #endif  // BOOST_WINDOWS_API
 
+#include "error_handling.hpp"
+
 //  BOOST_FILESYSTEM_STATUS_CACHE enables file_status cache in
 //  dir_itr_increment. The config tests are placed here because some of the
 //  macros being tested come from dirent.h.

src/operations.cpp

@@ -139,6 +139,8 @@
 #     include <sys/utime.h>
 #   endif
 
+#include "windows_tools.hpp"
+
 # endif  // BOOST_WINDOWS_API
 
 #include "error_handling.hpp"
@@ -482,31 +484,6 @@ namespace
       || errval == ERROR_BAD_NETPATH;  // "//nosuch" on Win32
   }
 
-  static bool equal_extension( wchar_t const* p, wchar_t const (&x1)[ 5 ], wchar_t const (&x2)[ 5 ] )
-  {
-    return
-      (p[0] == x1[0] || p[0] == x2[0]) &&
-      (p[1] == x1[1] || p[1] == x2[1]) &&
-      (p[2] == x1[2] || p[2] == x2[2]) &&
-      (p[3] == x1[3] || p[3] == x2[3]) &&
-      p[4] == 0;
-  }
-
-  perms make_permissions(const path& p, DWORD attr)
-  {
-    perms prms = fs::owner_read | fs::group_read | fs::others_read;
-    if  ((attr & FILE_ATTRIBUTE_READONLY) == 0)
-      prms |= fs::owner_write | fs::group_write | fs::others_write;
-    path ext = p.extension();
-    wchar_t const* q = ext.c_str();
-    if (equal_extension(q, L".exe", L".EXE")
-      || equal_extension(q, L".com", L".COM")
-      || equal_extension(q, L".bat", L".BAT")
-      || equal_extension(q, L".cmd", L".CMD"))
-      prms |= fs::owner_exe | fs::group_exe | fs::others_exe;
-    return prms;
-  }
-
   // these constants come from inspecting some Microsoft sample code
   std::time_t to_time_t(const FILETIME & ft)
   {
@@ -1762,6 +1739,8 @@ namespace detail
       return process_status_failure(p, ec);
     }
 
+    perms permissions = make_permissions(p, attr);
+
     //  reparse point handling;
     //    since GetFileAttributesW does not resolve symlinks, try to open a file
     //    handle to discover if the file exists
@@ -1782,13 +1761,13 @@ namespace detail
       }
 
       if (!is_reparse_point_a_symlink(p))
-        return file_status(reparse_file, make_permissions(p, attr));
+        return file_status(reparse_file, permissions);
     }
 
     if (ec != 0) ec->clear();
     return (attr & FILE_ATTRIBUTE_DIRECTORY)
-      ? file_status(directory_file, make_permissions(p, attr))
-      : file_status(regular_file, make_permissions(p, attr));
+      ? file_status(directory_file, permissions)
+      : file_status(regular_file, permissions);
 
 #   endif
   }
@@ -1848,14 +1827,16 @@ namespace detail
 
     if (ec != 0) ec->clear();
 
+    perms permissions = make_permissions(p, attr);
+
     if (attr & FILE_ATTRIBUTE_REPARSE_POINT)
       return is_reparse_point_a_symlink(p)
-             ? file_status(symlink_file, make_permissions(p, attr))
-             : file_status(reparse_file, make_permissions(p, attr));
+             ? file_status(symlink_file, permissions)
+             : file_status(reparse_file, permissions);
 
     return (attr & FILE_ATTRIBUTE_DIRECTORY)
-      ? file_status(directory_file, make_permissions(p, attr))
-      : file_status(regular_file, make_permissions(p, attr));
+      ? file_status(directory_file, permissions)
+      : file_status(regular_file, permissions);
 
 #   endif
   }

src/windows_tools.hpp

@@ -0,0 +1,54 @@
+//  windows_tools.hpp  -----------------------------------------------------------------//
+
+//  Copyright 2002-2009, 2014 Beman Dawes
+//  Copyright 2001 Dietmar Kuehl
+
+//  Distributed under the Boost Software License, Version 1.0.
+//  See http://www.boost.org/LICENSE_1_0.txt
+
+//  See library home page at http://www.boost.org/libs/filesystem
+
+//--------------------------------------------------------------------------------------//
+
+#ifndef BOOST_FILESYSTEM_SRC_WINDOWS_TOOLS_HPP_
+#define BOOST_FILESYSTEM_SRC_WINDOWS_TOOLS_HPP_
+
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/file_status.hpp>
+
+#include <windows.h>
+
+namespace boost {
+namespace filesystem {
+namespace detail {
+
+inline bool equal_extension(wchar_t const* p, wchar_t const (&x1)[5], wchar_t const (&x2)[5])
+{
+  return
+    (p[0] == x1[0] || p[0] == x2[0]) &&
+    (p[1] == x1[1] || p[1] == x2[1]) &&
+    (p[2] == x1[2] || p[2] == x2[2]) &&
+    (p[3] == x1[3] || p[3] == x2[3]) &&
+    p[4] == 0;
+}
+
+inline boost::filesystem::perms make_permissions(const boost::filesystem::path& p, DWORD attr)
+{
+  boost::filesystem::perms prms = boost::filesystem::owner_read | boost::filesystem::group_read | boost::filesystem::others_read;
+  if  ((attr & FILE_ATTRIBUTE_READONLY) == 0u)
+    prms |= boost::filesystem::owner_write | boost::filesystem::group_write | boost::filesystem::others_write;
+  boost::filesystem::path ext = p.extension();
+  wchar_t const* q = ext.c_str();
+  if (equal_extension(q, L".exe", L".EXE")
+    || equal_extension(q, L".com", L".COM")
+    || equal_extension(q, L".bat", L".BAT")
+    || equal_extension(q, L".cmd", L".CMD"))
+    prms |= boost::filesystem::owner_exe | boost::filesystem::group_exe | boost::filesystem::others_exe;
+  return prms;
+}
+
+} // namespace detail
+} // namespace filesystem
+} // namespace boost
+
+#endif // BOOST_FILESYSTEM_SRC_WINDOWS_TOOLS_HPP_