From: charlet Date: Tue, 15 Mar 2005 16:02:05 +0000 (+0000) Subject: 2005-03-08 Doug Rupp X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7163d04ce8e8db43be124fd50cd5b5fa95bac2b7;p=thirdparty%2Fgcc.git 2005-03-08 Doug Rupp * gnatchop.adb (Locate_Executable): Normalize the possibly VMS style Command_Name. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@96498 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/gcc/ada/gnatchop.adb b/gcc/ada/gnatchop.adb index a6b12e5c5fa8..a7c657073427 100644 --- a/gcc/ada/gnatchop.adb +++ b/gcc/ada/gnatchop.adb @@ -521,17 +521,19 @@ procedure Gnatchop is function Locate_Executable (Program_Name : String; - Look_For_Prefix : Boolean := True) - return String_Access + Look_For_Prefix : Boolean := True) return String_Access is - Current_Command : constant String := Command_Name; - End_Of_Prefix : Natural := Current_Command'First - 1; - Start_Of_Prefix : Positive := Current_Command'First; + Current_Command : constant String := Normalize_Pathname (Command_Name); + End_Of_Prefix : Natural; + Start_Of_Prefix : Positive; Result : String_Access; begin + Start_Of_Prefix := Current_Command'First; + End_Of_Prefix := Start_Of_Prefix - 1; if Look_For_Prefix then + -- Find Start_Of_Prefix for J in reverse Current_Command'Range loop @@ -546,8 +548,6 @@ procedure Gnatchop is -- Find End_Of_Prefix - End_Of_Prefix := Start_Of_Prefix - 1; - for J in reverse Start_Of_Prefix .. Current_Command'Last loop if Current_Command (J) = '-' then End_Of_Prefix := J;