From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <pmderodat@sourceware.org>
Received: by sourceware.org (Postfix, from userid 1914)
 id 68A0C3858415; Tue,  9 Nov 2021 09:47:42 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 68A0C3858415
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="utf-8"
From: Pierre-Marie de Rodat <pmderodat@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r12-5042] [Ada] Invalid GPR_PROJECT_PATH_FILE confuses gnatls
X-Act-Checkin: gcc
X-Git-Author: Justin Squirek <squirek@adacore.com>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: 5861b128b9942ef92b3755610b0459273e7cf234
X-Git-Newrev: a2e4ebe02b1be5ee81b24ff504f58ac9078953c0
Message-Id: <20211109094742.68A0C3858415@sourceware.org>
Date: Tue,  9 Nov 2021 09:47:42 +0000 (GMT)
X-BeenThere: gcc-cvs@gcc.gnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Gcc-cvs mailing list <gcc-cvs.gcc.gnu.org>
List-Unsubscribe: <https://gcc.gnu.org/mailman/options/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=unsubscribe>
List-Archive: <https://gcc.gnu.org/pipermail/gcc-cvs/>
List-Help: <mailto:gcc-cvs-request@gcc.gnu.org?subject=help>
List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Nov 2021 09:47:42 -0000

https://gcc.gnu.org/g:a2e4ebe02b1be5ee81b24ff504f58ac9078953c0

commit r12-5042-ga2e4ebe02b1be5ee81b24ff504f58ac9078953c0
Author: Justin Squirek <squirek@adacore.com>
Date:   Fri Oct 29 15:42:28 2021 -0400

    [Ada] Invalid GPR_PROJECT_PATH_FILE confuses gnatls
    
    gcc/ada/
    
            * gnatls.adb (Initialize_Default_Project_Path): Remove early
            abort on invalid path.

Diff:
---
 gcc/ada/gnatls.adb | 82 ++++++++++++++++++++++++++----------------------------
 1 file changed, 39 insertions(+), 43 deletions(-)

diff --git a/gcc/ada/gnatls.adb b/gcc/ada/gnatls.adb
index 68990e19605..b20cda4fdd6 100644
--- a/gcc/ada/gnatls.adb
+++ b/gcc/ada/gnatls.adb
@@ -1339,61 +1339,57 @@ procedure Gnatls is
          if Gpr_Prj_Path_File.all /= "" then
             FD := Open_Read (Gpr_Prj_Path_File.all, GNAT.OS_Lib.Text);
 
-            if FD = Invalid_FD then
-               Osint.Fail
-                 ("warning: could not read project path file """
-                  & Gpr_Prj_Path_File.all & """");
-            end if;
+            if FD /= Invalid_FD then
+               Len := Integer (File_Length (FD));
 
-            Len := Integer (File_Length (FD));
+               declare
+                  Buffer : String (1 .. Len);
+                  Index  : Positive := 1;
+                  Last   : Positive;
+                  Tmp    : String_Access;
 
-            declare
-               Buffer : String (1 .. Len);
-               Index  : Positive := 1;
-               Last   : Positive;
-               Tmp    : String_Access;
+               begin
+                  --  Read the file
 
-            begin
-               --  Read the file
+                  Len := Read (FD, Buffer (1)'Address, Len);
+                  Close (FD);
 
-               Len := Read (FD, Buffer (1)'Address, Len);
-               Close (FD);
+                  --  Scan the file line by line
 
-               --  Scan the file line by line
+                  while Index < Buffer'Last loop
 
-               while Index < Buffer'Last loop
+                     --  Find the end of line
 
-                  --  Find the end of line
+                     Last := Index;
+                     while Last <= Buffer'Last
+                       and then Buffer (Last) /= ASCII.LF
+                       and then Buffer (Last) /= ASCII.CR
+                     loop
+                        Last := Last + 1;
+                     end loop;
 
-                  Last := Index;
-                  while Last <= Buffer'Last
-                    and then Buffer (Last) /= ASCII.LF
-                    and then Buffer (Last) /= ASCII.CR
-                  loop
-                     Last := Last + 1;
-                  end loop;
-
-                  --  Ignore empty lines
+                     --  Ignore empty lines
 
-                  if Last > Index then
-                     Tmp := Self;
-                     Self :=
-                       new String'
-                         (Tmp.all & Path_Separator &
-                          Buffer (Index .. Last - 1));
-                     Free (Tmp);
-                  end if;
+                     if Last > Index then
+                        Tmp := Self;
+                        Self :=
+                          new String'
+                            (Tmp.all & Path_Separator &
+                             Buffer (Index .. Last - 1));
+                        Free (Tmp);
+                     end if;
 
-                  --  Find the beginning of the next line
+                     --  Find the beginning of the next line
 
-                  Index := Last;
-                  while Buffer (Index) = ASCII.CR or else
-                        Buffer (Index) = ASCII.LF
-                  loop
-                     Index := Index + 1;
+                     Index := Last;
+                     while Buffer (Index) = ASCII.CR or else
+                           Buffer (Index) = ASCII.LF
+                     loop
+                        Index := Index + 1;
+                     end loop;
                   end loop;
-               end loop;
-            end;
+               end;
+            end if;
 
          end if;