GetBaseUTF8

2 files changed, 62 insertions, 0 deletions

diff --git a/src/fs/Traits.cxx b/src/fs/Traits.cxx
new file mode 100644
index 000000000..2c3ce075b
--- /dev/null
+++ b/src/fs/Traits.cxx
@@ -0,0 +1,45 @@
+/*
+ * 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.
+ */
+
+#include "config.h"
+#include "Traits.hxx"
+
+#include <string.h>
+
+const char *
+PathTraits::GetBaseUTF8(const char *p)
+{
+	assert(p != nullptr);
+
+	const char *slash = strrchr(p, SEPARATOR_UTF8);
+	return slash != nullptr
+		? slash + 1
+		: p;
+}
+
+std::string
+PathTraits::GetParentUTF8(const char *p)
+{
+	assert(p != nullptr);
+
+	const char *slash = strrchr(p, SEPARATOR_UTF8);
+	return slash != nullptr
+		? std::string(p, slash)
+		: std::string(".");
+}
diff --git a/src/fs/Traits.hxx b/src/fs/Traits.hxx
index 564f6ca1a..244ab8b5c 100644
--- a/src/fs/Traits.hxx
+++ b/src/fs/Traits.hxx
@@ -27,6 +27,8 @@
 #include <glib.h>
 #endif
 
+#include <string>
+
 #include <assert.h>
 
 class Error;
@@ -84,6 +86,21 @@ struct PathTraits {
 		return IsSeparatorUTF8(*p);
 #endif
 	}
+
+	/**
+	 * Determine the "base" file name of the given UTF-8 path.
+	 * The return value points inside the given string.
+	 */
+	gcc_pure gcc_nonnull_all
+	static const char *GetBaseUTF8(const char *p);
+
+	/**
+	 * Determine the "parent" file name of the given UTF-8 path.
+	 * As a special case, returns the string "." if there is no
+	 * separator in the given input string.
+	 */
+	gcc_pure gcc_nonnull_all
+	static std::string GetParentUTF8(const char *p);
 };
 
 #endif