mesos-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jo...@apache.org
Subject [3/9] mesos git commit: Stout: Added support for correct path delimiters in Windows.
Date Mon, 23 May 2016 23:49:04 GMT
Stout: Added support for correct path delimiters in Windows.

Review: https://reviews.apache.org/r/47389/


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/c3d8c92d
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/c3d8c92d
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/c3d8c92d

Branch: refs/heads/master
Commit: c3d8c92d2bd410353a30ea278765616b2a471b1e
Parents: 79f07ef
Author: Alex Clemmer <clemmer.alexander@gmail.com>
Authored: Mon May 23 15:41:59 2016 -0700
Committer: Joris Van Remoortere <joris.van.remoortere@gmail.com>
Committed: Mon May 23 16:48:48 2016 -0700

----------------------------------------------------------------------
 3rdparty/stout/include/stout/os/constants.hpp |  9 +++-
 3rdparty/stout/include/stout/os/mkdir.hpp     |  8 ++--
 3rdparty/stout/include/stout/path.hpp         | 48 ++++++++++++++--------
 3 files changed, 44 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/c3d8c92d/3rdparty/stout/include/stout/os/constants.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/include/stout/os/constants.hpp b/3rdparty/stout/include/stout/os/constants.hpp
index 438840a..c71d52e 100644
--- a/3rdparty/stout/include/stout/os/constants.hpp
+++ b/3rdparty/stout/include/stout/os/constants.hpp
@@ -17,7 +17,14 @@
 
 namespace os {
 
-const std::string DIRECTORY_SEPARATOR = "/";
+constexpr char WINDOWS_PATH_SEPARATOR = '\\';
+constexpr char POSIX_PATH_SEPARATOR = '/';
+
+#ifndef __WINDOWS__
+constexpr char PATH_SEPARATOR = POSIX_PATH_SEPARATOR;
+#else
+constexpr char PATH_SEPARATOR = WINDOWS_PATH_SEPARATOR;
+#endif // __WINDOWS__
 
 } // namespace os {
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/c3d8c92d/3rdparty/stout/include/stout/os/mkdir.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/include/stout/os/mkdir.hpp b/3rdparty/stout/include/stout/os/mkdir.hpp
index e86dbfd..fe86864 100644
--- a/3rdparty/stout/include/stout/os/mkdir.hpp
+++ b/3rdparty/stout/include/stout/os/mkdir.hpp
@@ -42,13 +42,13 @@ inline Try<Nothing> mkdir(const std::string& directory, bool
recursive = true)
     }
   } else {
     std::vector<std::string> tokens =
-      strings::tokenize(directory, os::DIRECTORY_SEPARATOR);
+      strings::tokenize(directory, stringify(os::PATH_SEPARATOR));
 
     std::string path = "";
 
     // We got an absolute path, so keep the leading slash.
-    if (directory.find_first_of(os::DIRECTORY_SEPARATOR) == 0) {
-      path = os::DIRECTORY_SEPARATOR;
+    if (directory.find_first_of(stringify(os::PATH_SEPARATOR)) == 0) {
+      path = os::PATH_SEPARATOR;
     }
 
     foreach (const std::string& token, tokens) {
@@ -57,7 +57,7 @@ inline Try<Nothing> mkdir(const std::string& directory, bool recursive
= true)
         return ErrnoError();
       }
 
-      path += os::DIRECTORY_SEPARATOR;
+      path += os::PATH_SEPARATOR;
     }
   }
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/c3d8c92d/3rdparty/stout/include/stout/path.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/include/stout/path.hpp b/3rdparty/stout/include/stout/path.hpp
index ef53804..1b8326f 100644
--- a/3rdparty/stout/include/stout/path.hpp
+++ b/3rdparty/stout/include/stout/path.hpp
@@ -17,15 +17,24 @@
 #include <utility>
 #include <vector>
 
+#include <stout/stringify.hpp>
 #include <stout/strings.hpp>
 
+#include <stout/os/constants.hpp>
+
+
 namespace path {
 
 // Base case.
-inline std::string join(const std::string& path1, const std::string& path2)
+inline std::string join(
+    const std::string& path1,
+    const std::string& path2,
+    const char _separator = os::PATH_SEPARATOR)
 {
-  return strings::remove(path1, "/", strings::SUFFIX) + "/" +
-         strings::remove(path2, "/", strings::PREFIX);
+  const std::string separator = stringify(_separator);
+  return strings::remove(path1, separator, strings::SUFFIX) +
+         separator +
+         strings::remove(path2, separator, strings::PREFIX);
 }
 
 
@@ -55,7 +64,7 @@ inline std::string join(const std::vector<std::string>& paths)
 
 inline bool absolute(const std::string& path)
 {
-  if (path.empty() || path[0] != '/') {
+  if (path.empty() || path[0] != os::PATH_SEPARATOR) {
     return false;
   }
 
@@ -66,8 +75,10 @@ inline bool absolute(const std::string& path)
 
 
 /**
- * Represents a POSIX file systems path and offers common path
- * manipulations.
+ * Represents a POSIX or Windows file system path and offers common path
+ * manipulations. When reading the comments below, keep in mind that '/' refers
+ * to the path separator character, so read it as "'/' or '\', depending on
+ * platform".
  */
 class Path
 {
@@ -110,18 +121,18 @@ public:
     size_t end = value.size() - 1;
 
     // Remove trailing slashes.
-    if (value[end] == '/') {
-      end = value.find_last_not_of('/', end);
+    if (value[end] == os::PATH_SEPARATOR) {
+      end = value.find_last_not_of(os::PATH_SEPARATOR, end);
 
       // Paths containing only slashes result into "/".
       if (end == std::string::npos) {
-        return std::string("/");
+        return stringify(os::PATH_SEPARATOR);
       }
     }
 
     // 'start' should point towards the character after the last slash
     // that is non trailing.
-    size_t start = value.find_last_of('/', end);
+    size_t start = value.find_last_of(os::PATH_SEPARATOR, end);
 
     if (start == std::string::npos) {
       start = 0;
@@ -132,6 +143,11 @@ public:
     return value.substr(start, end + 1 - start);
   }
 
+  // TODO(hausdorff) Make sure this works on Windows for very short path names,
+  // such as "C:\Temp". There is a distinction between "C:" and "C:\", the
+  // former means "current directory of the C drive", while the latter means
+  // "The root of the C drive". Also make sure that UNC paths are handled.
+  // Will probably need to use the Windows path functions for that.
   /**
    * Extracts the component up to, but not including, the final '/'.
    * Trailing '/' characters are not counted as part of the pathname.
@@ -164,12 +180,12 @@ public:
     size_t end = value.size() - 1;
 
     // Remove trailing slashes.
-    if (value[end] == '/') {
-      end = value.find_last_not_of('/', end);
+    if (value[end] == os::PATH_SEPARATOR) {
+      end = value.find_last_not_of(os::PATH_SEPARATOR, end);
     }
 
     // Remove anything trailing the last slash.
-    end = value.find_last_of('/', end);
+    end = value.find_last_of(os::PATH_SEPARATOR, end);
 
     // Paths containing no slashes result in ".".
     if (end == std::string::npos) {
@@ -178,16 +194,16 @@ public:
 
     // Paths containing only slashes result in "/".
     if (end == 0) {
-      return std::string("/");
+      return stringify(os::PATH_SEPARATOR);
     }
 
     // 'end' should point towards the last non slash character
     // preceding the last slash.
-    end = value.find_last_not_of('/', end);
+    end = value.find_last_not_of(os::PATH_SEPARATOR, end);
 
     // Paths containing no non slash characters result in "/".
     if (end == std::string::npos) {
-      return std::string("/");
+      return stringify(os::PATH_SEPARATOR);
     }
 
     return value.substr(0, end + 1);


Mime
View raw message