From f17267c88f7c61a0b9395f2fe24b62e2587ab98c Mon Sep 17 00:00:00 2001 From: Gary Dismukes Date: Mon, 16 Dec 2019 10:33:22 +0000 Subject: [PATCH] [Ada] Typo fixes and minor reformatting 2019-12-16 Gary Dismukes gcc/ada/ * libgnat/g-exptty.adb, libgnat/g-exptty.ads: Typo fixes and minor reformatting. From-SVN: r279415 --- gcc/ada/ChangeLog | 5 +++++ gcc/ada/libgnat/g-exptty.adb | 16 ++++++++++------ gcc/ada/libgnat/g-exptty.ads | 4 ++-- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 0f843f3b66e..12380b6b983 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2019-12-16 Gary Dismukes + + * libgnat/g-exptty.adb, libgnat/g-exptty.ads: Typo fixes and + minor reformatting. + 2019-12-16 Eric Botcazou * exp_ch6.adb (Requires_Atomic_Or_Volatile_Copy): New predicate. diff --git a/gcc/ada/libgnat/g-exptty.adb b/gcc/ada/libgnat/g-exptty.adb index b193448a0d0..758be7ac2d7 100644 --- a/gcc/ada/libgnat/g-exptty.adb +++ b/gcc/ada/libgnat/g-exptty.adb @@ -38,8 +38,9 @@ package body GNAT.Expect.TTY is On_Windows : constant Boolean := Directory_Separator = '\'; -- True when on Windows - function Waitpid (Process : System.Address; Blocking : Integer) - return Integer; + function Waitpid + (Process : System.Address; + Blocking : Integer) return Integer; pragma Import (C, Waitpid, "__gnat_tty_waitpid"); -- Wait for a specific process id, and return its exit code @@ -48,8 +49,7 @@ package body GNAT.Expect.TTY is ------------------------ function Is_Process_Running - (Descriptor : in out TTY_Process_Descriptor) - return Boolean + (Descriptor : in out TTY_Process_Descriptor) return Boolean is begin if Descriptor.Process = System.Null_Address then @@ -57,6 +57,7 @@ package body GNAT.Expect.TTY is end if; Descriptor.Exit_Status := Waitpid (Descriptor.Process, Blocking => 0); + return Descriptor.Exit_Status = Still_Active; end Is_Process_Running; @@ -106,17 +107,20 @@ package body GNAT.Expect.TTY is Status := Waitpid (Descriptor.Process, Blocking => 0); if Status = Still_Active then - -- In theory the process might hav died since the check. In + -- In theory the process might have died since the check. In -- practice the following calls should not cause any issue. + Interrupt (Descriptor); delay (0.05); Terminate_Process (Descriptor.Process); Status := Waitpid (Descriptor.Process, Blocking => 1); Descriptor.Exit_Status := Status; end if; + else -- If Exit_Status is not STILL_ACTIVE just retrieve the saved - -- exit status + -- exit status. + Status := Descriptor.Exit_Status; end if; diff --git a/gcc/ada/libgnat/g-exptty.ads b/gcc/ada/libgnat/g-exptty.ads index f61ea6215b4..683a453ec21 100644 --- a/gcc/ada/libgnat/g-exptty.ads +++ b/gcc/ada/libgnat/g-exptty.ads @@ -95,7 +95,7 @@ package GNAT.Expect.TTY is function Is_Process_Running (Descriptor : in out TTY_Process_Descriptor) return Boolean; - -- Return True is the process is still alive + -- Returns True if the process is still alive private @@ -142,7 +142,7 @@ private Process : System.Address := System.Null_Address; -- Underlying structure used in C Exit_Status : Integer := Still_Active; - -- Hold the exit status of the process. + -- Holds the exit status of the process Use_Pipes : Boolean := True; end record; -- 2.30.2