aboutsummaryrefslogtreecommitdiffstats
path: root/src/fs
diff options
context:
space:
mode:
Diffstat (limited to 'src/fs')
-rw-r--r--src/fs/FileSystem.hxx62
-rw-r--r--src/fs/Path.cxx11
-rw-r--r--src/fs/Path.hxx57
-rw-r--r--src/fs/Traits.hxx89
4 files changed, 129 insertions, 90 deletions
diff --git a/src/fs/FileSystem.hxx b/src/fs/FileSystem.hxx
index d247f1a75..faa00751a 100644
--- a/src/fs/FileSystem.hxx
+++ b/src/fs/FileSystem.hxx
@@ -21,6 +21,7 @@
#define MPD_FS_FILESYSTEM_HXX
#include "check.h"
+#include "Traits.hxx"
#include "system/fd_util.h"
#include "Path.hxx"
@@ -31,41 +32,42 @@
#include <stdio.h>
namespace FOpenMode {
-/**
- * Open mode for reading text files.
- */
-constexpr Path::const_pointer ReadText = "r";
-
-/**
- * Open mode for reading binary files.
- */
-constexpr Path::const_pointer ReadBinary = "rb";
-
-/**
- * Open mode for writing text files.
- */
-constexpr Path::const_pointer WriteText = "w";
-
-/**
- * Open mode for writing binary files.
- */
-constexpr Path::const_pointer WriteBinary = "wb";
-
-/**
- * Open mode for appending text files.
- */
-constexpr Path::const_pointer AppendText = "a";
-
-/**
- * Open mode for appending binary files.
- */
-constexpr Path::const_pointer AppendBinary = "ab";
+ /**
+ * Open mode for reading text files.
+ */
+ constexpr PathTraits::const_pointer ReadText = "r";
+
+ /**
+ * Open mode for reading binary files.
+ */
+ constexpr PathTraits::const_pointer ReadBinary = "rb";
+
+ /**
+ * Open mode for writing text files.
+ */
+ constexpr PathTraits::const_pointer WriteText = "w";
+
+ /**
+ * Open mode for writing binary files.
+ */
+ constexpr PathTraits::const_pointer WriteBinary = "wb";
+
+ /**
+ * Open mode for appending text files.
+ */
+ constexpr PathTraits::const_pointer AppendText = "a";
+
+ /**
+ * Open mode for appending binary files.
+ */
+ constexpr PathTraits::const_pointer AppendBinary = "ab";
}
/**
* Wrapper for fopen() that uses #Path names.
*/
-static inline FILE *FOpen(const Path &file, Path::const_pointer mode)
+static inline FILE *
+FOpen(const Path &file, PathTraits::const_pointer mode)
{
return fopen(file.c_str(), mode);
}
diff --git a/src/fs/Path.cxx b/src/fs/Path.cxx
index 4a4292d05..ecdf73e49 100644
--- a/src/fs/Path.cxx
+++ b/src/fs/Path.cxx
@@ -29,11 +29,6 @@
#include <assert.h>
#include <string.h>
-#ifdef WIN32
-#include <windows.h> // for GetACP()
-#include <stdio.h> // for sprintf()
-#endif
-
inline Path::Path(Donate, pointer _value)
:value(_value) {
g_free(_value);
@@ -86,14 +81,14 @@ Path::RelativeFS(const char *other_fs) const
other_fs += l;
if (*other_fs != 0) {
- if (!IsSeparatorFS(*other_fs))
+ if (!PathTraits::IsSeparatorFS(*other_fs))
/* mismatch */
return nullptr;
/* skip remaining path separators */
do {
++other_fs;
- } while (IsSeparatorFS(*other_fs));
+ } while (PathTraits::IsSeparatorFS(*other_fs));
}
return other_fs;
@@ -105,7 +100,7 @@ Path::ChopSeparators()
size_t l = length();
const char *p = data();
- while (l >= 2 && IsSeparatorFS(p[l - 1])) {
+ while (l >= 2 && PathTraits::IsSeparatorFS(p[l - 1])) {
--l;
#if GCC_CHECK_VERSION(4,7) && !defined(__clang__)
diff --git a/src/fs/Path.hxx b/src/fs/Path.hxx
index a6e74104e..558e2923f 100644
--- a/src/fs/Path.hxx
+++ b/src/fs/Path.hxx
@@ -22,6 +22,7 @@
#include "check.h"
#include "Compiler.h"
+#include "Traits.hxx"
#ifdef WIN32
#include <glib.h>
@@ -40,20 +41,10 @@ class Error;
class Path {
typedef std::string string;
-public:
- typedef string::value_type value_type;
- typedef string::pointer pointer;
- typedef string::const_pointer const_pointer;
-
-#ifdef WIN32
- static constexpr value_type SEPARATOR_FS = '\\';
- static constexpr char SEPARATOR_UTF8 = '/';
-#else
- static constexpr value_type SEPARATOR_FS = '/';
- static constexpr char SEPARATOR_UTF8 = '/';
-#endif
+ typedef PathTraits::value_type value_type;
+ typedef PathTraits::pointer pointer;
+ typedef PathTraits::const_pointer const_pointer;
-private:
string value;
struct Donate {};
@@ -216,47 +207,9 @@ public:
*/
void ChopSeparators();
- static constexpr bool IsSeparatorFS(value_type ch) {
- return
-#ifdef WIN32
- ch == '/' ||
-#endif
- ch == SEPARATOR_FS;
- }
-
- static constexpr bool IsSeparatorUTF8(char ch) {
- return
-#ifdef WIN32
- ch == '/' ||
-#endif
- ch == SEPARATOR_UTF8;
- }
-
- gcc_pure
- static bool IsAbsoluteFS(const_pointer p) {
- assert(p != nullptr);
-
-#ifdef WIN32
- return g_path_is_absolute(p);
-#else
- return IsSeparatorFS(*p);
-#endif
- }
-
- gcc_pure
- static bool IsAbsoluteUTF8(const char *p) {
- assert(p != nullptr);
-
-#ifdef WIN32
- return g_path_is_absolute(p);
-#else
- return IsSeparatorUTF8(*p);
-#endif
- }
-
gcc_pure
bool IsAbsolute() {
- return IsAbsoluteFS(c_str());
+ return PathTraits::IsAbsoluteFS(c_str());
}
};
diff --git a/src/fs/Traits.hxx b/src/fs/Traits.hxx
new file mode 100644
index 000000000..564f6ca1a
--- /dev/null
+++ b/src/fs/Traits.hxx
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2003-2013 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program 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 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPD_FS_TRAITS_HXX
+#define MPD_FS_TRAITS_HXX
+
+#include "check.h"
+#include "Compiler.h"
+
+#ifdef WIN32
+#include <glib.h>
+#endif
+
+#include <assert.h>
+
+class Error;
+
+/**
+ * This class describes the nature of a filesystem path.
+ */
+struct PathTraits {
+ typedef char value_type;
+ typedef char *pointer;
+ typedef const char *const_pointer;
+
+#ifdef WIN32
+ static constexpr value_type SEPARATOR_FS = '\\';
+ static constexpr char SEPARATOR_UTF8 = '/';
+#else
+ static constexpr value_type SEPARATOR_FS = '/';
+ static constexpr char SEPARATOR_UTF8 = '/';
+#endif
+
+ static constexpr bool IsSeparatorFS(value_type ch) {
+ return
+#ifdef WIN32
+ ch == '/' ||
+#endif
+ ch == SEPARATOR_FS;
+ }
+
+ static constexpr bool IsSeparatorUTF8(char ch) {
+ return
+#ifdef WIN32
+ ch == '/' ||
+#endif
+ ch == SEPARATOR_UTF8;
+ }
+
+ gcc_pure
+ static bool IsAbsoluteFS(const_pointer p) {
+ assert(p != nullptr);
+
+#ifdef WIN32
+ return g_path_is_absolute(p);
+#else
+ return IsSeparatorFS(*p);
+#endif
+ }
+
+ gcc_pure
+ static bool IsAbsoluteUTF8(const char *p) {
+ assert(p != nullptr);
+
+#ifdef WIN32
+ return g_path_is_absolute(p);
+#else
+ return IsSeparatorUTF8(*p);
+#endif
+ }
+};
+
+#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 11:57:38 +0000