Skip to content

R
riscv-gcc-1
Commit 8967c38f by Vincent Celier Committed by Arnaud Charlet
Options

g-os_lib.ads, [...] (Locate_Exec_On_Path): Always return an absolute path name. 

2006-10-31  Vincent Celier  <celier@adacore.com>

	* g-os_lib.ads, g-os_lib.adb (Locate_Exec_On_Path): Always return an
	absolute path name.
	(Locate_Regular_File): Ditto
	(Change_Dir): Remove, no longer used
	(Normalize_Pathname): Do not use Change_Dir to get the drive letter
	on Windows. Get it calling Get_Current_Dir.
	(OpenVMS): Remove imported boolean, no longer needed.
	(Normalize_Pathname)[VMS]: Do not resolve directory names.
	(Pid_To_Integer): New function to convert a Process_Id to  Integer

From-SVN: r118279
parent ac36caab
Showing with 185 additions and 214 deletions
gcc/ada/g-os_lib.adb
...@@ -49,14 +49,6 @@ package body GNAT.OS_Lib is ...@@ -49,14 +49,6 @@ package body GNAT.OS_Lib is
procedure Dup2 (Old_Fd, New_Fd : File_Descriptor); procedure Dup2 (Old_Fd, New_Fd : File_Descriptor);
pragma Import (C, Dup2, "__gnat_dup2"); pragma Import (C, Dup2, "__gnat_dup2");
OpenVMS : Boolean;
-- Note: OpenVMS should be a constant, but it cannot be, because it
-- prevents bootstrapping on some platforms.
pragma Import (Ada, OpenVMS, "system__openvms");
-- Needed to avoid doing useless checks when non on a VMS platform (see
-- Normalize_Pathname).
On_Windows : constant Boolean := Directory_Separator = '\'; On_Windows : constant Boolean := Directory_Separator = '\';
-- An indication that we are on Windows. Used in Normalize_Pathname, to -- An indication that we are on Windows. Used in Normalize_Pathname, to
-- deal with drive letters in the beginning of absolute paths. -- deal with drive letters in the beginning of absolute paths.
...@@ -713,9 +705,9 @@ package body GNAT.OS_Lib is ...@@ -713,9 +705,9 @@ package body GNAT.OS_Lib is
-- Create_Output_Text_File -- -- Create_Output_Text_File --
----------------------------- -----------------------------
function Create_Output_Text_File (Name : String) return File_Descriptor is function Create_Output_Text_File (Name : String) return File_Descriptor is
function C_Create_File function C_Create_File
(Name : C_File_Name) return File_Descriptor; (Name : C_File_Name) return File_Descriptor;
pragma Import (C, C_Create_File, "__gnat_create_output_file"); pragma Import (C, C_Create_File, "__gnat_create_output_file");
C_Name : String (1 .. Name'Length + 1); C_Name : String (1 .. Name'Length + 1);
...@@ -914,43 +906,40 @@ package body GNAT.OS_Lib is ...@@ -914,43 +906,40 @@ package body GNAT.OS_Lib is
return Result; return Result;
end Get_Debuggable_Suffix; end Get_Debuggable_Suffix;
---------------------------------- ---------------------------
-- Get_Target_Debuggable_Suffix -- -- Get_Executable_Suffix --
---------------------------------- ---------------------------
function Get_Target_Debuggable_Suffix return String_Access is function Get_Executable_Suffix return String_Access is
Target_Exec_Ext_Ptr : Address; procedure Get_Suffix_Ptr (Length, Ptr : Address);
pragma Import pragma Import (C, Get_Suffix_Ptr, "__gnat_get_executable_suffix_ptr");
(C, Target_Exec_Ext_Ptr, "__gnat_target_debuggable_extension");
procedure Strncpy (Astring_Addr, Cstring : Address; N : Integer); procedure Strncpy (Astring_Addr, Cstring : Address; N : Integer);
pragma Import (C, Strncpy, "strncpy"); pragma Import (C, Strncpy, "strncpy");
function Strlen (Cstring : Address) return Integer; Suffix_Ptr : Address;
pragma Import (C, Strlen, "strlen");
Suffix_Length : Integer; Suffix_Length : Integer;
Result : String_Access; Result : String_Access;
begin begin
Suffix_Length := Strlen (Target_Exec_Ext_Ptr); Get_Suffix_Ptr (Suffix_Length'Address, Suffix_Ptr'Address);
Result := new String (1 .. Suffix_Length); Result := new String (1 .. Suffix_Length);
if Suffix_Length > 0 then if Suffix_Length > 0 then
Strncpy (Result.all'Address, Target_Exec_Ext_Ptr, Suffix_Length); Strncpy (Result.all'Address, Suffix_Ptr, Suffix_Length);
end if; end if;
return Result; return Result;
end Get_Target_Debuggable_Suffix; end Get_Executable_Suffix;
--------------------------- -----------------------
-- Get_Executable_Suffix -- -- Get_Object_Suffix --
--------------------------- -----------------------
function Get_Executable_Suffix return String_Access is function Get_Object_Suffix return String_Access is
procedure Get_Suffix_Ptr (Length, Ptr : Address); procedure Get_Suffix_Ptr (Length, Ptr : Address);
pragma Import (C, Get_Suffix_Ptr, "__gnat_get_executable_suffix_ptr"); pragma Import (C, Get_Suffix_Ptr, "__gnat_get_object_suffix_ptr");
procedure Strncpy (Astring_Addr, Cstring : Address; N : Integer); procedure Strncpy (Astring_Addr, Cstring : Address; N : Integer);
pragma Import (C, Strncpy, "strncpy"); pragma Import (C, Strncpy, "strncpy");
...@@ -969,16 +958,16 @@ package body GNAT.OS_Lib is ...@@ -969,16 +958,16 @@ package body GNAT.OS_Lib is
end if; end if;
return Result; return Result;
end Get_Executable_Suffix; end Get_Object_Suffix;
---------------------------------- ----------------------------------
-- Get_Target_Executable_Suffix -- -- Get_Target_Debuggable_Suffix --
---------------------------------- ----------------------------------
function Get_Target_Executable_Suffix return String_Access is function Get_Target_Debuggable_Suffix return String_Access is
Target_Exec_Ext_Ptr : Address; Target_Exec_Ext_Ptr : Address;
pragma Import pragma Import
(C, Target_Exec_Ext_Ptr, "__gnat_target_executable_extension"); (C, Target_Exec_Ext_Ptr, "__gnat_target_debuggable_extension");
procedure Strncpy (Astring_Addr, Cstring : Address; N : Integer); procedure Strncpy (Astring_Addr, Cstring : Address; N : Integer);
pragma Import (C, Strncpy, "strncpy"); pragma Import (C, Strncpy, "strncpy");
...@@ -999,34 +988,37 @@ package body GNAT.OS_Lib is ...@@ -999,34 +988,37 @@ package body GNAT.OS_Lib is
end if; end if;
return Result; return Result;
end Get_Target_Executable_Suffix; end Get_Target_Debuggable_Suffix;
----------------------- ----------------------------------
-- Get_Object_Suffix -- -- Get_Target_Executable_Suffix --
----------------------- ----------------------------------
function Get_Object_Suffix return String_Access is function Get_Target_Executable_Suffix return String_Access is
procedure Get_Suffix_Ptr (Length, Ptr : Address); Target_Exec_Ext_Ptr : Address;
pragma Import (C, Get_Suffix_Ptr, "__gnat_get_object_suffix_ptr"); pragma Import
(C, Target_Exec_Ext_Ptr, "__gnat_target_executable_extension");
procedure Strncpy (Astring_Addr, Cstring : Address; N : Integer); procedure Strncpy (Astring_Addr, Cstring : Address; N : Integer);
pragma Import (C, Strncpy, "strncpy"); pragma Import (C, Strncpy, "strncpy");
Suffix_Ptr : Address; function Strlen (Cstring : Address) return Integer;
pragma Import (C, Strlen, "strlen");
Suffix_Length : Integer; Suffix_Length : Integer;
Result : String_Access; Result : String_Access;
begin begin
Get_Suffix_Ptr (Suffix_Length'Address, Suffix_Ptr'Address); Suffix_Length := Strlen (Target_Exec_Ext_Ptr);
Result := new String (1 .. Suffix_Length); Result := new String (1 .. Suffix_Length);
if Suffix_Length > 0 then if Suffix_Length > 0 then
Strncpy (Result.all'Address, Suffix_Ptr, Suffix_Length); Strncpy (Result.all'Address, Target_Exec_Ext_Ptr, Suffix_Length);
end if; end if;
return Result; return Result;
end Get_Object_Suffix; end Get_Target_Executable_Suffix;
------------------------------ ------------------------------
-- Get_Target_Object_Suffix -- -- Get_Target_Object_Suffix --
...@@ -1273,6 +1265,25 @@ package body GNAT.OS_Lib is ...@@ -1273,6 +1265,25 @@ package body GNAT.OS_Lib is
return Is_Directory (F_Name'Address); return Is_Directory (F_Name'Address);
end Is_Directory; end Is_Directory;
----------------------
-- Is_Readable_File --
----------------------
function Is_Readable_File (Name : C_File_Name) return Boolean is
function Is_Readable_File (Name : Address) return Integer;
pragma Import (C, Is_Readable_File, "__gnat_is_readable_file");
begin
return Is_Readable_File (Name) /= 0;
end Is_Readable_File;
function Is_Readable_File (Name : String) return Boolean is
F_Name : String (1 .. Name'Length + 1);
begin
F_Name (1 .. Name'Length) := Name;
F_Name (F_Name'Last) := ASCII.NUL;
return Is_Readable_File (F_Name'Address);
end Is_Readable_File;
--------------------- ---------------------
-- Is_Regular_File -- -- Is_Regular_File --
--------------------- ---------------------
...@@ -1293,23 +1304,23 @@ package body GNAT.OS_Lib is ...@@ -1293,23 +1304,23 @@ package body GNAT.OS_Lib is
end Is_Regular_File; end Is_Regular_File;
---------------------- ----------------------
-- Is_Readable_File -- -- Is_Symbolic_Link --
---------------------- ----------------------
function Is_Readable_File (Name : C_File_Name) return Boolean is function Is_Symbolic_Link (Name : C_File_Name) return Boolean is
function Is_Readable_File (Name : Address) return Integer; function Is_Symbolic_Link (Name : Address) return Integer;
pragma Import (C, Is_Readable_File, "__gnat_is_readable_file"); pragma Import (C, Is_Symbolic_Link, "__gnat_is_symbolic_link");
begin begin
return Is_Readable_File (Name) /= 0; return Is_Symbolic_Link (Name) /= 0;
end Is_Readable_File; end Is_Symbolic_Link;
function Is_Readable_File (Name : String) return Boolean is function Is_Symbolic_Link (Name : String) return Boolean is
F_Name : String (1 .. Name'Length + 1); F_Name : String (1 .. Name'Length + 1);
begin begin
F_Name (1 .. Name'Length) := Name; F_Name (1 .. Name'Length) := Name;
F_Name (F_Name'Last) := ASCII.NUL; F_Name (F_Name'Last) := ASCII.NUL;
return Is_Readable_File (F_Name'Address); return Is_Symbolic_Link (F_Name'Address);
end Is_Readable_File; end Is_Symbolic_Link;
---------------------- ----------------------
-- Is_Writable_File -- -- Is_Writable_File --
...@@ -1330,25 +1341,6 @@ package body GNAT.OS_Lib is ...@@ -1330,25 +1341,6 @@ package body GNAT.OS_Lib is
return Is_Writable_File (F_Name'Address); return Is_Writable_File (F_Name'Address);
end Is_Writable_File; end Is_Writable_File;
----------------------
-- Is_Symbolic_Link --
----------------------
function Is_Symbolic_Link (Name : C_File_Name) return Boolean is
function Is_Symbolic_Link (Name : Address) return Integer;
pragma Import (C, Is_Symbolic_Link, "__gnat_is_symbolic_link");
begin
return Is_Symbolic_Link (Name) /= 0;
end Is_Symbolic_Link;
function Is_Symbolic_Link (Name : String) return Boolean is
F_Name : String (1 .. Name'Length + 1);
begin
F_Name (1 .. Name'Length) := Name;
F_Name (F_Name'Last) := ASCII.NUL;
return Is_Symbolic_Link (F_Name'Address);
end Is_Symbolic_Link;
------------------------- -------------------------
-- Locate_Exec_On_Path -- -- Locate_Exec_On_Path --
------------------------- -------------------------
...@@ -1380,6 +1372,19 @@ package body GNAT.OS_Lib is ...@@ -1380,6 +1372,19 @@ package body GNAT.OS_Lib is
else else
Result := To_Path_String_Access (Path_Addr, Path_Len); Result := To_Path_String_Access (Path_Addr, Path_Len);
Free (Path_Addr); Free (Path_Addr);
-- Always return an absolute path name
if not Is_Absolute_Path (Result.all) then
declare
Absolute_Path : constant String :=
Normalize_Pathname (Result.all);
begin
Free (Result);
Result := new String'(Absolute_Path);
end;
end if;
return Result; return Result;
end if; end if;
end Locate_Exec_On_Path; end Locate_Exec_On_Path;
...@@ -1422,6 +1427,7 @@ package body GNAT.OS_Lib is ...@@ -1422,6 +1427,7 @@ package body GNAT.OS_Lib is
is is
C_File_Name : String (1 .. File_Name'Length + 1); C_File_Name : String (1 .. File_Name'Length + 1);
C_Path : String (1 .. Path'Length + 1); C_Path : String (1 .. Path'Length + 1);
Result : String_Access;
begin begin
C_File_Name (1 .. File_Name'Length) := File_Name; C_File_Name (1 .. File_Name'Length) := File_Name;
...@@ -1430,7 +1436,20 @@ package body GNAT.OS_Lib is ...@@ -1430,7 +1436,20 @@ package body GNAT.OS_Lib is
C_Path (1 .. Path'Length) := Path; C_Path (1 .. Path'Length) := Path;
C_Path (C_Path'Last) := ASCII.NUL; C_Path (C_Path'Last) := ASCII.NUL;
return Locate_Regular_File (C_File_Name'Address, C_Path'Address); Result := Locate_Regular_File (C_File_Name'Address, C_Path'Address);
-- Always return an absolute path name
if Result /= null and then not Is_Absolute_Path (Result.all) then
declare
Absolute_Path : constant String := Normalize_Pathname (Result.all);
begin
Free (Result);
Result := new String'(Absolute_Path);
end;
end if;
return Result;
end Locate_Regular_File; end Locate_Regular_File;
------------------------ ------------------------
...@@ -1453,12 +1472,12 @@ package body GNAT.OS_Lib is ...@@ -1453,12 +1472,12 @@ package body GNAT.OS_Lib is
(Program_Name : String; (Program_Name : String;
Args : Argument_List; Args : Argument_List;
Output_File_Descriptor : File_Descriptor; Output_File_Descriptor : File_Descriptor;
Err_To_Out : Boolean := True) Err_To_Out : Boolean := True) return Process_Id
return Process_Id
is is
Saved_Output : File_Descriptor; Saved_Output : File_Descriptor;
Saved_Error : File_Descriptor := Invalid_FD; -- prevent warning Saved_Error : File_Descriptor := Invalid_FD; -- prevent warning
Pid : Process_Id; Pid : Process_Id;
begin begin
if Output_File_Descriptor = Invalid_FD then if Output_File_Descriptor = Invalid_FD then
return Invalid_Pid; return Invalid_Pid;
...@@ -1645,9 +1664,6 @@ package body GNAT.OS_Lib is ...@@ -1645,9 +1664,6 @@ package body GNAT.OS_Lib is
Length : System.Address); Length : System.Address);
pragma Import (C, Get_Current_Dir, "__gnat_get_current_dir"); pragma Import (C, Get_Current_Dir, "__gnat_get_current_dir");
function Change_Dir (Dir_Name : String) return Integer;
pragma Import (C, Change_Dir, "chdir");
Path_Buffer : String (1 .. Max_Path + Max_Path + 2); Path_Buffer : String (1 .. Max_Path + Max_Path + 2);
End_Path : Natural := 0; End_Path : Natural := 0;
Link_Buffer : String (1 .. Max_Path + 2); Link_Buffer : String (1 .. Max_Path + 2);
...@@ -1688,11 +1704,6 @@ package body GNAT.OS_Lib is ...@@ -1688,11 +1704,6 @@ package body GNAT.OS_Lib is
function Strlen (S : System.Address) return Integer; function Strlen (S : System.Address) return Integer;
pragma Import (C, Strlen, "strlen"); pragma Import (C, Strlen, "strlen");
function Get_Directory (Dir : String) return String;
-- If Dir is not empty, return it, adding a directory separator
-- if not already present, otherwise return current working directory
-- with terminating directory separator.
function Final_Value (S : String) return String; function Final_Value (S : String) return String;
-- Make final adjustment to the returned string. -- Make final adjustment to the returned string.
-- To compensate for non standard path name in Interix, -- To compensate for non standard path name in Interix,
...@@ -1700,57 +1711,10 @@ package body GNAT.OS_Lib is ...@@ -1700,57 +1711,10 @@ package body GNAT.OS_Lib is
-- letter 'A' to 'Z', add an additional '/' at the beginning -- letter 'A' to 'Z', add an additional '/' at the beginning
-- so that the returned value starts with "//x". -- so that the returned value starts with "//x".
------------------- function Get_Directory (Dir : String) return String;
-- Get_Directory -- -- If Dir is not empty, return it, adding a directory separator
------------------- -- if not already present, otherwise return current working directory
-- with terminating directory separator.
function Get_Directory (Dir : String) return String is
begin
-- Directory given, add directory separator if needed
if Dir'Length > 0 then
if Dir (Dir'Last) = Directory_Separator then
return Directory;
else
declare
Result : String (1 .. Dir'Length + 1);
begin
Result (1 .. Dir'Length) := Dir;
Result (Result'Length) := Directory_Separator;
return Result;
end;
end if;
-- Directory name not given, get current directory
else
declare
Buffer : String (1 .. Max_Path + 2);
Path_Len : Natural := Max_Path;
begin
Get_Current_Dir (Buffer'Address, Path_Len'Address);
if Buffer (Path_Len) /= Directory_Separator then
Path_Len := Path_Len + 1;
Buffer (Path_Len) := Directory_Separator;
end if;
-- By default, the drive letter on Windows is in upper case
if On_Windows and then Path_Len >= 2 and then
Buffer (2) = ':'
then
System.Case_Util.To_Upper (Buffer (1 .. 1));
end if;
return Buffer (1 .. Path_Len);
end;
end if;
end Get_Directory;
Reference_Dir : constant String := Get_Directory (Directory);
-- Current directory name specified
----------------- -----------------
-- Final_Value -- -- Final_Value --
...@@ -1830,6 +1794,58 @@ package body GNAT.OS_Lib is ...@@ -1830,6 +1794,58 @@ package body GNAT.OS_Lib is
end if; end if;
end Final_Value; end Final_Value;
-------------------
-- Get_Directory --
-------------------
function Get_Directory (Dir : String) return String is
begin
-- Directory given, add directory separator if needed
if Dir'Length > 0 then
if Dir (Dir'Last) = Directory_Separator then
return Directory;
else
declare
Result : String (1 .. Dir'Length + 1);
begin
Result (1 .. Dir'Length) := Dir;
Result (Result'Length) := Directory_Separator;
return Result;
end;
end if;
-- Directory name not given, get current directory
else
declare
Buffer : String (1 .. Max_Path + 2);
Path_Len : Natural := Max_Path;
begin
Get_Current_Dir (Buffer'Address, Path_Len'Address);
if Buffer (Path_Len) /= Directory_Separator then
Path_Len := Path_Len + 1;
Buffer (Path_Len) := Directory_Separator;
end if;
-- By default, the drive letter on Windows is in upper case
if On_Windows and then Path_Len >= 2 and then
Buffer (2) = ':'
then
System.Case_Util.To_Upper (Buffer (1 .. 1));
end if;
return Buffer (1 .. Path_Len);
end;
end if;
end Get_Directory;
Reference_Dir : constant String := Get_Directory (Directory);
-- Current directory name specified
-- Start of processing for Normalize_Pathname -- Start of processing for Normalize_Pathname
begin begin
...@@ -1885,90 +1901,36 @@ package body GNAT.OS_Lib is ...@@ -1885,90 +1901,36 @@ package body GNAT.OS_Lib is
end loop; end loop;
end if; end if;
-- Resolve directory names for VMS and Windows -- Resolve directory names for Windows (formerly also VMS)
-- On VMS, if we have a Unix path such as /temp/..., and TEMP is a -- On VMS, if we have a Unix path such as /temp/..., and TEMP is a
-- logical name, we need to resolve this logical name. -- logical name, we must not try to resolve this logical name, because
-- it may have multiple equivalences and if resolved we will only
-- get the first one.
-- On Windows, if we have an absolute path starting with a directory -- On Windows, if we have an absolute path starting with a directory
-- separator, we need to have the drive letter appended in front. -- separator, we need to have the drive letter appended in front.
-- For both platforms, Get_Current_Dir will return a suitable -- On Windows, Get_Current_Dir will return a suitable directory
-- directory name (logical names resolved on VMS, path starting with -- name (path starting with a drive letter on Windows). So we take this
-- a drive letter on Windows). So we find the directory, change to it, -- drive letter and prepend it to the current path.
-- call Get_Current_Dir and change the directory to the returned value.
-- Then, of course, we return to the previous directory.
if (OpenVMS or On_Windows) if On_Windows
and then Path_Buffer (1) = Directory_Separator and then Path_Buffer (1) = Directory_Separator
and then Path_Buffer (2) /= Directory_Separator
then then
declare declare
Cur_Dir : String := Get_Directory (""); Cur_Dir : String := Get_Directory ("");
-- Save the current directory, so that we can change dir back to -- Get the current directory to get the drive letter
-- it. It is not a constant, because the last character (a
-- directory separator) is changed to ASCII.NUL to call the C
-- function chdir.
Path : String := Path_Buffer (1 .. End_Path + 1);
-- Copy of the current path. One character is added that may be
-- set to ASCII.NUL to call chdir.
Pos : Positive := End_Path;
-- Position of the last directory separator
Status : Integer;
-- Value returned by chdir
begin begin
-- Look for the last directory separator if Cur_Dir'Length > 2
and then Cur_Dir (Cur_Dir'First + 1) = ':'
while Path (Pos) /= Directory_Separator loop then
Pos := Pos - 1; Path_Buffer (3 .. End_Path + 2) := Path_Buffer (1 .. End_Path);
end loop; Path_Buffer (1 .. 2) :=
Cur_Dir (Cur_Dir'First .. Cur_Dir'First + 1);
-- Get the previous character that is not a directory separator End_Path := End_Path + 2;
while Pos > 1 and then Path (Pos) = Directory_Separator loop
Pos := Pos - 1;
end loop;
-- If we are at the start of the path, take the full path.
-- It may be a file in the root directory, but it may also be
-- a subdirectory of the root directory.
if Pos = 1 then
Pos := End_Path;
end if;
-- Add the ASCII.NUL to be able to call the C function chdir
Path (Pos + 1) := ASCII.NUL;
Status := Change_Dir (Path (1 .. Pos + 1));
-- If Status is not zero, then we do nothing: this is a file
-- path or it is not a valid directory path.
if Status = 0 then
declare
New_Dir : constant String := Get_Directory ("");
-- The directory path
New_Path : String (1 .. New_Dir'Length + End_Path - Pos);
-- The new complete path, that is built below
begin
New_Path (1 .. New_Dir'Length) := New_Dir;
New_Path (New_Dir'Length + 1 .. New_Path'Last) :=
Path_Buffer (Pos + 1 .. End_Path);
End_Path := New_Path'Length;
Path_Buffer (1 .. End_Path) := New_Path;
end;
-- Back to where we were before
Cur_Dir (Cur_Dir'Last) := ASCII.NUL;
Status := Change_Dir (Cur_Dir);
end if; end if;
end; end;
end if; end if;
...@@ -2205,6 +2167,15 @@ package body GNAT.OS_Lib is ...@@ -2205,6 +2167,15 @@ package body GNAT.OS_Lib is
return Open_Read_Write (C_Name (C_Name'First)'Address, Fmode); return Open_Read_Write (C_Name (C_Name'First)'Address, Fmode);
end Open_Read_Write; end Open_Read_Write;
--------------------
-- Pid_To_Integer --
--------------------
function Pid_To_Integer (Pid : Process_Id) return Integer is
begin
return Integer (Pid);
end Pid_To_Integer;
---------- ----------
-- Read -- -- Read --
---------- ----------
......
gcc/ada/g-os_lib.ads
...@@ -198,7 +198,7 @@ package GNAT.OS_Lib is ...@@ -198,7 +198,7 @@ package GNAT.OS_Lib is
-- for subsequent use in Write calls. File descriptor returned is -- for subsequent use in Write calls. File descriptor returned is
-- Invalid_FD if file cannot be successfully created. -- Invalid_FD if file cannot be successfully created.
function Create_Output_Text_File (Name : String) return File_Descriptor; function Create_Output_Text_File (Name : String) return File_Descriptor;
-- Creates new text file with given name suitable to redirect standard -- Creates new text file with given name suitable to redirect standard
-- output, returning file descriptor. File descriptor returned is -- output, returning file descriptor. File descriptor returned is
-- Invalid_FD if file cannot be successfully created. -- Invalid_FD if file cannot be successfully created.
...@@ -600,8 +600,7 @@ package GNAT.OS_Lib is ...@@ -600,8 +600,7 @@ package GNAT.OS_Lib is
function Locate_Regular_File function Locate_Regular_File
(File_Name : C_File_Name; (File_Name : C_File_Name;
Path : C_File_Name) Path : C_File_Name) return String_Access;
return String_Access;
------------------ ------------------
-- Subprocesses -- -- Subprocesses --
...@@ -667,8 +666,7 @@ package GNAT.OS_Lib is ...@@ -667,8 +666,7 @@ package GNAT.OS_Lib is
function Spawn function Spawn
(Program_Name : String; (Program_Name : String;
Args : Argument_List) Args : Argument_List) return Integer;
return Integer;
-- Similar to the above procedure, but returns the actual status returned -- Similar to the above procedure, but returns the actual status returned
-- by the operating system, or -1 under VxWorks and any other similar -- by the operating system, or -1 under VxWorks and any other similar
-- operating systems which have no notion of separately spawnable programs. -- operating systems which have no notion of separately spawnable programs.
...@@ -707,16 +705,19 @@ package GNAT.OS_Lib is ...@@ -707,16 +705,19 @@ package GNAT.OS_Lib is
type Process_Id is private; type Process_Id is private;
-- A private type used to identify a process activated by the following -- A private type used to identify a process activated by the following
-- non-blocking call. The only meaningful operation on this type is a -- non-blocking calls. The only meaningful operation on this type is a
-- comparison for equality. -- comparison for equality.
Invalid_Pid : constant Process_Id; Invalid_Pid : constant Process_Id;
-- A special value used to indicate errors, as described below -- A special value used to indicate errors, as described below
function Pid_To_Integer (Pid : Process_Id) return Integer;
-- Convert a process id to an Integer. Useful for writing hash functions
-- for type Process_Id or to compare two Process_Id (e.g. for sorting).
function Non_Blocking_Spawn function Non_Blocking_Spawn
(Program_Name : String; (Program_Name : String;
Args : Argument_List) Args : Argument_List) return Process_Id;
return Process_Id;
-- This is a non blocking call. The Process_Id of the spawned process is -- This is a non blocking call. The Process_Id of the spawned process is
-- returned. Parameters are to be used as in Spawn. If Invalid_Pid is -- returned. Parameters are to be used as in Spawn. If Invalid_Pid is
-- returned the program could not be spawned. -- returned the program could not be spawned.
...@@ -745,8 +746,7 @@ package GNAT.OS_Lib is ...@@ -745,8 +746,7 @@ package GNAT.OS_Lib is
(Program_Name : String; (Program_Name : String;
Args : Argument_List; Args : Argument_List;
Output_File : String; Output_File : String;
Err_To_Out : Boolean := True) Err_To_Out : Boolean := True) return Process_Id;
return Process_Id;
-- Similar to the procedure above, but saves the output of the command to -- Similar to the procedure above, but saves the output of the command to
-- a file with the name Output_File. -- a file with the name Output_File.
-- --
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment