[ros-diffs] [royce] 17583: don't crash if path == base_directory.

royce at svn.reactos.com royce at svn.reactos.com
Sun Aug 28 14:09:01 CEST 2005


don't crash if path == base_directory.
sorry I forgot to commit my changes to this file last night
Modified: trunk/reactos/tools/rbuild/XML.cpp
  _____  

Modified: trunk/reactos/tools/rbuild/XML.cpp
--- trunk/reactos/tools/rbuild/XML.cpp	2005-08-28 12:03:25 UTC (rev
17582)
+++ trunk/reactos/tools/rbuild/XML.cpp	2005-08-28 12:08:53 UTC (rev
17583)
@@ -176,7 +176,9 @@

 }
 
 string
-Path::RelativeFromDirectory ( const string& path, const string&
base_directory )
+Path::RelativeFromDirectory (
+	const string& path,
+	const string& base_directory )
 {
 	vector<string> vbase, vpath, vout;
 	Path::Split ( vbase, base_directory, true );
@@ -190,6 +192,8 @@
 	size_t i = 0;
 	while ( i < vbase.size() && i < vpath.size() && vbase[i] ==
vpath[i] )
 		++i;
+	if ( vbase.size() == vpath.size() && i == vpath.size() )
+		return ".";
 	if ( i < vbase.size() )
 	{
 		// path goes above our base directory, we will need some
..'s
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://www.reactos.org/pipermail/ros-diffs/attachments/20050828/1e695a47/attachment.html


More information about the Ros-diffs mailing list