From 0a44fa4c6c87c76d2adfa1edf68b9f2cfe2096cb Mon Sep 17 00:00:00 2001 From: KWSys Robot Date: Wed, 10 Jul 2013 08:16:24 -0400 Subject: [PATCH] KWSys 2013-07-10 (beef6819) Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ beef6819 | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' f6c4c247..beef6819 Brad King (1): beef6819 SystemTools: Implement IsSubDirectory without loop Change-Id: Ifab0c0384c7fbf1f9fc934918573a49b38f7bc0a --- SystemTools.cxx | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/SystemTools.cxx b/SystemTools.cxx index 4d5af5ea7..935b836cb 100644 --- a/SystemTools.cxx +++ b/SystemTools.cxx @@ -4261,17 +4261,13 @@ bool SystemTools::IsSubDirectory(const char* cSubdir, const char* cDir) } kwsys_stl::string subdir = cSubdir; kwsys_stl::string dir = cDir; + SystemTools::ConvertToUnixSlashes(subdir); SystemTools::ConvertToUnixSlashes(dir); - kwsys_stl::string path = subdir; - do + if(subdir.size() > dir.size() && subdir[dir.size()] == '/') { - path = SystemTools::GetParentDirectory(path.c_str()); - if(SystemTools::ComparePath(dir.c_str(), path.c_str())) - { - return true; - } + std::string s = subdir.substr(0, dir.size()); + return SystemTools::ComparePath(s.c_str(), dir.c_str()); } - while ( path.size() > dir.size() ); return false; }