From dffaa076c551cc5a5165c0564810bd1add7131c4 Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Fri, 2 Nov 2012 12:40:05 +0100
Subject: [PATCH] made dropFileExtension() a function usable from anywhere
 changed dropFileExtension() implementation

---
 BaseLib/FileTools.cpp | 2 +-
 BaseLib/FileTools.h   | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/BaseLib/FileTools.cpp b/BaseLib/FileTools.cpp
index 124ba0bfea8..0e8ce3155ff 100644
--- a/BaseLib/FileTools.cpp
+++ b/BaseLib/FileTools.cpp
@@ -87,7 +87,7 @@ std::string dropFileExtension(std::string const& filename)
 	if (p == std::string::npos)
 		return filename;
 
-	return filename.substr(0, filename.length() - p);
+	return filename.substr(0, p);
 }
 
 std::string extractBaseName(std::string const& pathname)
diff --git a/BaseLib/FileTools.h b/BaseLib/FileTools.h
index 50cbc3282d5..f524b9c19bd 100644
--- a/BaseLib/FileTools.h
+++ b/BaseLib/FileTools.h
@@ -75,6 +75,11 @@ std::string getFileExtension(std::string const& filename);
  */
 bool hasFileExtension(std::string const& extension, std::string const& filename);
 
+/** Returns a string with file extension as found by getFileExtension()
+ * dropped.
+ */
+std::string dropFileExtension(std::string const& filename);
+
 /**
  * Checks if file_name already contains a qualified path and if not copies the
  * path from source.
-- 
GitLab