From a581d8a27aa6c7d582ee73136e888821493f31bb Mon Sep 17 00:00:00 2001 From: Mikhail Glushenkov Date: Tue, 2 Nov 2010 20:32:39 +0000 Subject: Make FindProgramByName return paths with slashes unmodified on Windows. This makes its behaviour more consistent across platforms. llvm-svn: 118048 --- llvm/lib/System/Win32/Program.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'llvm/lib/System/Win32/Program.inc') diff --git a/llvm/lib/System/Win32/Program.inc b/llvm/lib/System/Win32/Program.inc index b55aa2fa80f..2d6e665377e 100644 --- a/llvm/lib/System/Win32/Program.inc +++ b/llvm/lib/System/Win32/Program.inc @@ -67,10 +67,12 @@ Program::FindProgramByName(const std::string& progName) { Path temp; if (!temp.set(progName)) // invalid name return Path(); - if (temp.canExecute()) // already executable as is + // Return paths with slashes verbatim. + if (progName.find('\\') != std::string::npos || + progName.find('/') != std::string::npos) return temp; - // At this point, the file name is valid and its not executable. + // At this point, the file name is valid and does not contain slashes. // Let Windows search for it. char buffer[MAX_PATH]; char *dummy = NULL; -- cgit v1.2.3