summaryrefslogtreecommitdiff
path: root/gcc/ada/g-expect.adb
diff options
context:
space:
mode:
authorcharlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4>2009-07-20 13:18:34 +0000
committercharlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4>2009-07-20 13:18:34 +0000
commitfd66bc6b802ea710b059191f50e3281aecd3bb39 (patch)
tree6d0d286c708ed3fff7533ab8f04416f1b91f3d68 /gcc/ada/g-expect.adb
parentd2b860b429d3193f405e86e718daad04dd400807 (diff)
downloadgcc-fd66bc6b802ea710b059191f50e3281aecd3bb39.tar.gz
2009-07-20 Vadim Godunko <godunko@adacore.com>
* a-coorma.adb: Minor reformatting. 2009-07-20 Ed Schonberg <schonberg@adacore.com> * sem_ch3 (Build_Itype_Reference): Make public, for use on non-null access return types. * sem_ch6.adb (Analyze_Return_Type): If return is a not null subtype, provide an itype reference to gigi to force elaboration of the subtype at the proper point. 2009-07-20 Tristan Gingold <gingold@adacore.com> * g-expect.adb: Avoid closeing already closed handle. 2009-07-20 Robert Dewar <dewar@adacore.com> * sprint.adb (Write_Subprogram_Name): New procedure to output subprogram name with possible preceding $ (replaces Note_Implicit_Run_Time_Call). git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@149812 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/g-expect.adb')
-rw-r--r--gcc/ada/g-expect.adb9
1 files changed, 7 insertions, 2 deletions
diff --git a/gcc/ada/g-expect.adb b/gcc/ada/g-expect.adb
index 7ce2c89d771..405b0331275 100644
--- a/gcc/ada/g-expect.adb
+++ b/gcc/ada/g-expect.adb
@@ -814,7 +814,8 @@ package body GNAT.Expect is
Send (Process, Input);
end if;
- GNAT.OS_Lib.Close (Get_Input_Fd (Process));
+ Close (Process.Input_Fd);
+ Process.Input_Fd := Invalid_FD;
declare
Result : Expect_Match;
@@ -1305,10 +1306,14 @@ package body GNAT.Expect is
pragma Warnings (Off, Pipe1);
pragma Warnings (Off, Pipe2);
pragma Warnings (Off, Pipe3);
+
begin
Close (Pipe1.Input);
Close (Pipe2.Output);
- Close (Pipe3.Output);
+
+ if Pipe3.Output /= Pipe2.Output then
+ Close (Pipe3.Output);
+ end if;
end Set_Up_Parent_Communications;
------------------