Backported fix for bug CORE-2151 : Temp directory with space in the m…

…iddle wrongly truncated from the rightmost space
FirebirdSQL · Oct 27, 2008 · f5c1932 · f5c1932
1 parent f947054
commit f5c1932
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 17 deletions.
diff --git a/src/common/config/dir_list.cpp b/src/common/config/dir_list.cpp
@@ -257,18 +257,6 @@ const
 	return true;
 }
 
-void TempDirectoryList::initTemp() 
-{
-	initialize(true);
-
-	// Iterate through directories to parse them
-	for (size_t i = 0; i < getCount(); i++) {
-		PathName dir = (*this)[i];
-		size_t pos = dir.rfind(" ");
-		(*this)[i] = ParsedPath(dir.substr(0, pos));
-	}
-}
-
 const PathName TempDirectoryList::getConfigString() const
 {
 	const char* value = Config::getTempDirectories();

diff --git a/src/common/config/dir_list.h b/src/common/config/dir_list.h
@@ -124,19 +124,16 @@ class TempDirectoryList : public DirectoryList {
 	explicit TempDirectoryList(MemoryPool& p) 
 		: DirectoryList(p)
 	{
-		initTemp();
+		initialize(true);
 	}
 	TempDirectoryList()
 	{
-		initTemp();
+		initialize(true);
 	}
 
 private:
 	// implementation of the inherited function
 	const PathName getConfigString() const;
-
-	// load items from DirectoryList
-	void initTemp();
 };
 
 } //namespace Firebird