[Winmerge-svn] SF.net SVN: winmerge:[7536] trunk/Src/paths.cpp

[<sdo...@us...>]

Revision: 7536
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7536&view=rev
Author:   sdottaka
Date:     2011-06-04 07:30:15 +0000 (Sat, 04 Jun 2011)

Log Message:
-----------
make "paths_test" unit test pass

Modified Paths:
--------------
    trunk/Src/paths.cpp

Modified: trunk/Src/paths.cpp
===================================================================
--- trunk/Src/paths.cpp	2011-06-04 07:24:21 UTC (rev 7535)
+++ trunk/Src/paths.cpp	2011-06-04 07:30:15 UTC (rev 7536)
@@ -504,9 +504,10 @@
 	// Remove last part of path
 	size_t pos = parentPath.rfind('\\');
 
-	if (pos > -1)
+	if (pos != parentPath.npos)
 	{
-		parentPath.resize(pos);
+		// Do not remove trailing slash from root directories
+		parentPath.resize(pos == 2 ? pos + 1 : pos);
 	}
 	return parentPath;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.