41intnam.ads, [...]: Merge in ACT changes.

	* 41intnam.ads, 42intnam.ads, 4aintnam.ads, 4cintnam.ads,
	4dintnam.ads, 4gintnam.ads, 4hintnam.ads, 4lintnam.ads,
	4mintnam.ads, 4pintnam.ads, 4rintnam.ads, 4sintnam.ads,
	4uintnam.ads, 4vcalend.adb, 4zintnam.ads, 52system.ads,
	5amastop.adb, 5asystem.ads, 5ataprop.adb, 5atpopsp.adb,
	5avxwork.ads, 5bosinte.adb, 5bsystem.ads, 5esystem.ads,
	5fsystem.ads, 5ftaprop.adb, 5ginterr.adb, 5gmastop.adb,
	5gsystem.ads, 5gtaprop.adb, 5gtasinf.adb, 5gtasinf.ads,
	5hparame.ads, 5hsystem.ads, 5htaprop.adb, 5htraceb.adb,
	5itaprop.adb, 5ksystem.ads, 5kvxwork.ads, 5lintman.adb,
	5lsystem.ads, 5mvxwork.ads, 5ninmaop.adb, 5nosinte.ads,
	5ntaprop.adb, 5ointerr.adb, 5omastop.adb, 5oosinte.adb,
	5osystem.ads, 5otaprop.adb, 5otaspri.ads, 5pvxwork.ads,
	5qtaprop.adb, 5sintman.adb, 5ssystem.ads, 5staprop.adb,
	5stpopse.adb, 5svxwork.ads, 5tosinte.ads, 5uintman.adb,
	5vasthan.adb, 5vinmaop.adb, 5vinterr.adb, 5vintman.adb,
	5vmastop.adb, 5vparame.ads, 5vsystem.ads, 5vtaprop.adb,
	5vtpopde.adb, 5wmemory.adb, 5wsystem.ads, 5wtaprop.adb,
	5ysystem.ads, 5zinterr.adb, 5zintman.adb, 5zosinte.adb,
	5zosinte.ads, 5zsystem.ads, 5ztaprop.adb, 6vcpp.adb, 6vcstrea.adb,
	7sintman.adb, 7staprop.adb, 7stpopsp.adb, 9drpc.adb,
	Make-lang.in, Makefile.in, a-caldel.adb, a-comlin.ads,
	a-dynpri.adb, a-except.adb, a-except.ads, a-finali.adb,
	a-ncelfu.ads, a-reatim.adb, a-retide.adb, a-stream.ads,
	a-ststio.adb, a-ststio.ads, a-stwifi.adb, a-tags.adb, a-tasatt.adb,
	a-textio.adb, a-tideau.adb, a-tiflau.adb, a-tigeau.adb,
	a-tigeau.ads, a-tiinau.adb, a-timoau.adb, a-witeio.adb,
	a-wtdeau.adb, a-wtenau.adb, a-wtflau.adb, a-wtgeau.adb,
	a-wtgeau.ads, a-wtinau.adb, a-wtmoau.adb, ada-tree.def, ada-tree.h,
	adaint.c, adaint.h, ali-util.adb, ali.adb, ali.ads, atree.adb,
	atree.ads, atree.h, back_end.adb, bcheck.adb, bindgen.adb,
	bindusg.adb, checks.adb, comperr.adb, config-lang.in, csets.adb,
	csets.ads, cstand.adb, cstreams.c, debug.adb, debug.ads, decl.c,
	einfo.adb, einfo.ads, einfo.h, elists.h, errout.adb, errout.ads,
	eval_fat.adb, exp_aggr.adb, exp_attr.adb, exp_ch11.adb,
	exp_ch12.adb, exp_ch13.adb, exp_ch2.adb, exp_ch3.adb, exp_ch3.ads,
	exp_ch4.adb, exp_ch5.adb, exp_ch6.adb, exp_ch7.adb, exp_ch7.ads,
	exp_ch9.adb, exp_ch9.ads, exp_dbug.adb, exp_dbug.ads, exp_disp.ads,
	exp_dist.adb, exp_fixd.adb, exp_intr.adb, exp_pakd.adb,
	exp_prag.adb, exp_strm.adb, exp_util.adb, exp_util.ads,
	expander.adb, expect.c, fe.h, fmap.adb, fmap.ads, fname-uf.adb,
	freeze.adb, frontend.adb, g-awk.adb, g-cgideb.adb, g-comlin.adb,
	g-comlin.ads, g-debpoo.adb, g-dirope.adb, g-dirope.ads,
	g-dyntab.adb, g-expect.adb, g-expect.ads, g-io.ads, g-io_aux.adb,
	g-io_aux.ads, g-locfil.adb, g-locfil.ads, g-os_lib.adb,
	g-os_lib.ads, g-regexp.adb, g-regpat.adb, g-socket.adb,
	g-socket.ads, g-spipat.adb, g-table.adb, g-trasym.adb,
	g-trasym.ads, gigi.h, gmem.c, gnat1drv.adb, gnatbind.adb, gnatbl.c,
	gnatchop.adb, gnatcmd.adb, gnatdll.adb, gnatfind.adb, gnatlbr.adb,
	gnatlink.adb, gnatls.adb, gnatmem.adb, gnatprep.adb, gnatvsn.ads,
	gnatxref.adb, hlo.adb, hostparm.ads, i-cobol.adb, i-cpp.adb,
	i-cstrea.ads, i-cstrin.adb, i-pacdec.adb, i-vxwork.ads,
	impunit.adb, init.c, inline.adb, io-aux.c, layout.adb, lib-load.adb,
	lib-util.adb, lib-writ.adb, lib-writ.ads, lib-xref.adb,
	lib-xref.ads, lib.adb, lib.ads, make.adb, makeusg.adb, mdll.adb,
	memroot.adb, misc.c, mlib-tgt.adb, mlib-utl.adb, mlib-utl.ads,
	mlib.adb, namet.adb, namet.ads, namet.h, nlists.h, nmake.adb,
	nmake.ads, nmake.adt, opt.adb, opt.ads, osint.adb, osint.ads,
	output.adb, output.ads, par-ch2.adb, par-ch3.adb, par-ch5.adb,
	par-prag.adb, par-tchk.adb, par-util.adb, par.adb, prj-attr.adb,
	prj-dect.adb, prj-env.adb, prj-env.ads, prj-nmsc.adb, prj-part.adb,
	prj-proc.adb, prj-strt.adb, prj-tree.adb, prj-tree.ads, prj.adb,
	prj.ads, raise.c, raise.h, repinfo.adb, restrict.adb, restrict.ads,
	rident.ads, rtsfind.adb, rtsfind.ads, s-arit64.adb, s-asthan.adb,
	s-atacco.adb, s-atacco.ads, s-auxdec.adb, s-crc32.adb, s-crc32.ads,
	s-direio.adb, s-fatgen.adb, s-fileio.adb, s-finimp.adb,
	s-gloloc.adb, s-gloloc.ads, s-interr.adb, s-mastop.adb,
	s-mastop.ads, s-memory.adb, s-parame.ads, s-parint.adb,
	s-pooglo.adb, s-pooloc.adb, s-rpc.adb, s-secsta.adb, s-sequio.adb,
	s-shasto.adb, s-soflin.adb, s-soflin.ads, s-stache.adb,
	s-taasde.adb, s-taasde.ads, s-tadeca.adb, s-tadeca.ads,
	s-tadert.adb, s-tadert.ads, s-taenca.adb, s-taenca.ads,
	s-taprob.adb, s-taprop.ads, s-tarest.adb, s-tasdeb.adb,
	s-tasini.adb, s-tasini.ads, s-taskin.adb, s-taskin.ads,
	s-tasque.adb, s-tasque.ads, s-tasren.adb, s-tasren.ads,
	s-tassta.adb, s-tasuti.adb, s-tasuti.ads, s-tataat.adb,
	s-tataat.ads, s-tpoben.adb, s-tpoben.ads, s-tpobop.adb,
	s-tposen.adb, s-tposen.ads, s-traceb.adb, s-traceb.ads,
	s-unstyp.ads, s-widenu.adb, scn-nlit.adb, scn.adb, sem.adb,
	sem_aggr.adb, sem_attr.adb, sem_attr.ads, sem_case.adb,
	sem_ch10.adb, sem_ch11.adb, sem_ch11.ads, sem_ch12.adb,
	sem_ch13.adb, sem_ch13.ads, sem_ch2.adb, sem_ch3.adb, sem_ch3.ads,
	sem_ch4.adb, sem_ch5.adb, sem_ch6.adb, sem_ch6.ads, sem_ch7.adb,
	sem_ch8.adb, sem_ch8.ads, sem_ch9.adb, sem_disp.adb, sem_dist.adb,
	sem_elab.adb, sem_elim.adb, sem_elim.ads, sem_eval.adb,
	sem_intr.adb, sem_mech.adb, sem_prag.adb, sem_res.adb,
	sem_type.adb, sem_util.adb, sem_util.ads, sem_vfpt.adb,
	sem_warn.adb, sinfo.adb, sinfo.ads, sinfo.h, sinput-l.adb,
	sinput-l.ads, sinput.adb, sinput.ads, snames.adb, snames.ads,
	snames.h, sprint.adb, sprint.ads, stringt.adb, stringt.ads,
	stringt.h, style.adb, switch.adb, switch.ads, sysdep.c, system.ads,
	table.adb, targparm.adb, targparm.ads, targtyps.c, tbuild.adb,
	tbuild.ads, tracebak.c, trans.c, tree_gen.adb, tree_io.adb,
	treepr.adb, treepr.ads, treeprs.ads, treeprs.adt, ttypes.ads,
	types.adb, types.ads, types.h, uintp.ads, urealp.ads, usage.adb,
	utils.c, utils2.c, validsw.adb, xnmake.adb, xr_tabls.adb,
	xr_tabls.ads, xref_lib.adb, xref_lib.ads : Merge in ACT changes.

	* 1ssecsta.adb, 1ssecsta.ads, a-chlat9.ads, a-cwila9.ads,
	g-enblsp.adb, g-md5.adb, g-md5.ads, gnatname.adb, gnatname.ads,
	mkdir.c, osint-b.adb, osint-b.ads, osint-c.adb, osint-c.ads,
	osint-l.adb, osint-l.ads, osint-m.adb, osint-m.ads : New files

	* 3lsoccon.ads, 5qparame.ads, 5qvxwork.ads, 5smastop.adb,
	5zparame.ads, gnatmain.adb, gnatmain.ads, gnatpsys.adb : Removed

	* mdllfile.adb, mdllfile.ads, mdlltool.adb, mdlltool.ads : Renamed
	to mdll-fil.ad[bs] and mdll-util.ad[bs]

	* mdll-fil.adb, mdll-fil.ads, mdll-utl.adb, mdll-utl.ads : Renamed
	from mdllfile.ad[bs] and mdlltool.ad[bs]

From-SVN: r50451

1 files changed, 201 insertions, 62 deletions

diff --git a/gcc/ada/g-os_lib.adb b/gcc/ada/g-os_lib.adb
index 3c352366acb..9c5b6f14bd5 100644
--- a/gcc/ada/g-os_lib.adb
+++ b/gcc/ada/g-os_lib.adb
@@ -8,7 +8,7 @@
 --                                                                          --
 --                            $Revision$
 --                                                                          --
---           Copyright (C) 1995-2001 Ada Core Technologies, Inc.            --
+--           Copyright (C) 1995-2002 Ada Core Technologies, Inc.            --
 --                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -58,10 +58,15 @@ package body GNAT.OS_Lib is
       Result       : out Integer;
       Pid          : out Process_Id;
       Blocking     : Boolean);
-   --  Internal routine to implement the to Spawn (blocking and non blocking)
+   --  Internal routine to implement the two Spawn (blocking/non blocking)
    --  routines. If Blocking is set to True then the spawn is blocking
    --  otherwise it is non blocking. In this latter case the Pid contains
    --  the process id number. The first three parameters are as in Spawn.
+   --  Note that Spawn_Internal normalizes the argument list before calling
+   --  the low level system spawn routines (see Normalize_Arguments). Note
+   --  that Normalize_Arguments is designed to do nothing if it is called
+   --  more than once, so calling Normalize_Arguments before calling one
+   --  of the spawn routines is fine.
 
    function To_Path_String_Access
      (Path_Addr : Address;
@@ -103,31 +108,31 @@ package body GNAT.OS_Lib is
 
       loop
          declare
-            Quoted   : Boolean := False;
-            Backqd   : Boolean := False;
-            Old_Idx  : Integer;
+            Quoted  : Boolean := False;
+            Backqd  : Boolean := False;
+            Old_Idx : Integer;
 
          begin
             Old_Idx := Idx;
 
             loop
-               --  A vanilla space is the end of an argument
+               --  An unquoted space is the end of an argument
 
-               if not Backqd and then not Quoted
+               if not (Backqd or Quoted)
                  and then Arg_String (Idx) = ' '
                then
                   exit;
 
                --  Start of a quoted string
 
-               elsif not Backqd and then not Quoted
+               elsif not (Backqd or Quoted)
                  and then Arg_String (Idx) = '"'
                then
                   Quoted := True;
 
                --  End of a quoted string and end of an argument
 
-               elsif not Backqd and then Quoted
+               elsif (Quoted and not Backqd)
                  and then Arg_String (Idx) = '"'
                then
                   Idx := Idx + 1;
@@ -320,6 +325,25 @@ package body GNAT.OS_Lib is
       return File_Time_Stamp (F_Name'Address);
    end File_Time_Stamp;
 
+   ----------
+   -- Free --
+   ----------
+
+   procedure Free (Arg : in out String_List_Access) is
+      X : String_Access;
+
+      procedure Free_Array is new Unchecked_Deallocation
+        (Object => String_List, Name => String_List_Access);
+
+   begin
+      for J in Arg'Range loop
+         X := Arg (J);
+         Free (X);
+      end loop;
+
+      Free_Array (Arg);
+   end Free;
+
    ---------------------------
    -- Get_Debuggable_Suffix --
    ---------------------------
@@ -768,6 +792,82 @@ package body GNAT.OS_Lib is
       return Pid;
    end Non_Blocking_Spawn;
 
+   -------------------------
+   -- Normalize_Arguments --
+   -------------------------
+
+   procedure Normalize_Arguments (Args : in out Argument_List) is
+
+      procedure Quote_Argument (Arg : in out String_Access);
+      --  Add quote around argument if it contains spaces.
+
+      Argument_Needs_Quote : Boolean;
+      pragma Import (C, Argument_Needs_Quote, "__gnat_argument_needs_quote");
+
+      --------------------
+      -- Quote_Argument --
+      --------------------
+
+      procedure Quote_Argument (Arg : in out String_Access) is
+         Res          : String (1 .. Arg'Length * 2);
+         J            : Positive := 1;
+         Quote_Needed : Boolean  := False;
+
+      begin
+         if Arg (Arg'First) /= '"' or else Arg (Arg'Last) /= '"' then
+
+            --  Starting quote
+
+            Res (J) := '"';
+
+            for K in Arg'Range loop
+
+               J := J + 1;
+
+               if Arg (K) = '"' then
+                  Res (J) := '\';
+                  J := J + 1;
+                  Res (J) := '"';
+
+               elsif Arg (K) = ' ' then
+                  Res (J) := Arg (K);
+                  Quote_Needed := True;
+
+               else
+                  Res (J) := Arg (K);
+               end if;
+
+            end loop;
+
+            if Quote_Needed then
+
+               --  Ending quote
+
+               J := J + 1;
+               Res (J) := '"';
+
+               declare
+                  Old : String_Access := Arg;
+
+               begin
+                  Arg := new String'(Res (1 .. J));
+                  Free (Old);
+               end;
+            end if;
+
+         end if;
+      end Quote_Argument;
+
+   begin
+      if Argument_Needs_Quote then
+         for K in Args'Range loop
+            if Args (K) /= null then
+               Quote_Argument (Args (K));
+            end if;
+         end loop;
+      end if;
+   end Normalize_Arguments;
+
    ------------------------
    -- Normalize_Pathname --
    ------------------------
@@ -876,6 +976,10 @@ package body GNAT.OS_Lib is
       Reference_Dir : constant String := Get_Directory;
       --  Current directory name specified
 
+      -----------------
+      -- Final_Value --
+      -----------------
+
       function Final_Value (S : String) return String is
       begin
          --  Interix has the non standard notion of disk drive
@@ -1280,74 +1384,109 @@ package body GNAT.OS_Lib is
       Pid          : out Process_Id;
       Blocking     : Boolean)
    is
-      type Chars is array (Positive range <>) of aliased Character;
-      type Char_Ptr is access constant Character;
-
-      Command_Len : constant Positive := Program_Name'Length + 1
-                                           + Args_Length (Args);
-      Command_Last : Natural := 0;
-      Command : aliased Chars (1 .. Command_Len);
-      --  Command contains all characters of the Program_Name and Args,
-      --  all terminated by ASCII.NUL characters
-
-      Arg_List_Len : constant Positive := Args'Length + 2;
-      Arg_List_Last : Natural := 0;
-      Arg_List : aliased array (1 .. Arg_List_Len) of Char_Ptr;
-      --  List with pointers to NUL-terminated strings of the
-      --  Program_Name and the Args and terminated with a null pointer.
-      --  We rely on the default initialization for the last null pointer.
-
-      procedure Add_To_Command (S : String);
-      --  Add S and a NUL character to Command, updating Last
-
-      function Portable_Spawn (Args : Address) return Integer;
-      pragma Import (C, Portable_Spawn, "__gnat_portable_spawn");
-
-      function Portable_No_Block_Spawn (Args : Address) return Process_Id;
-      pragma Import
-        (C, Portable_No_Block_Spawn, "__gnat_portable_no_block_spawn");
 
-      --------------------
-      -- Add_To_Command --
-      --------------------
+      procedure Spawn (Args : Argument_List);
+      --  Call Spawn.
 
-      procedure Add_To_Command (S : String) is
-         First : constant Natural := Command_Last + 1;
+      N_Args : Argument_List (Args'Range);
+      --  Normalized arguments
 
-      begin
-         Command_Last := Command_Last + S'Length;
+      -----------
+      -- Spawn --
+      -----------
 
-         --  Move characters one at a time, because Command has
-         --  aliased components.
+      procedure Spawn (Args : Argument_List) is
+         type Chars is array (Positive range <>) of aliased Character;
+         type Char_Ptr is access constant Character;
 
-         for J in S'Range loop
-            Command (First + J - S'First) := S (J);
-         end loop;
+         Command_Len : constant Positive := Program_Name'Length + 1
+                                              + Args_Length (Args);
+         Command_Last : Natural := 0;
+         Command : aliased Chars (1 .. Command_Len);
+         --  Command contains all characters of the Program_Name and Args,
+         --  all terminated by ASCII.NUL characters
+
+         Arg_List_Len : constant Positive := Args'Length + 2;
+         Arg_List_Last : Natural := 0;
+         Arg_List : aliased array (1 .. Arg_List_Len) of Char_Ptr;
+         --  List with pointers to NUL-terminated strings of the
+         --  Program_Name and the Args and terminated with a null pointer.
+         --  We rely on the default initialization for the last null pointer.
+
+         procedure Add_To_Command (S : String);
+         --  Add S and a NUL character to Command, updating Last
+
+         function Portable_Spawn (Args : Address) return Integer;
+         pragma Import (C, Portable_Spawn, "__gnat_portable_spawn");
 
-         Command_Last := Command_Last + 1;
-         Command (Command_Last) := ASCII.NUL;
+         function Portable_No_Block_Spawn (Args : Address) return Process_Id;
+         pragma Import
+           (C, Portable_No_Block_Spawn, "__gnat_portable_no_block_spawn");
 
-         Arg_List_Last := Arg_List_Last + 1;
-         Arg_List (Arg_List_Last) := Command (First)'Access;
-      end Add_To_Command;
+         --------------------
+         -- Add_To_Command --
+         --------------------
+
+         procedure Add_To_Command (S : String) is
+            First : constant Natural := Command_Last + 1;
+
+         begin
+            Command_Last := Command_Last + S'Length;
+
+            --  Move characters one at a time, because Command has
+            --  aliased components.
+
+            for J in S'Range loop
+               Command (First + J - S'First) := S (J);
+            end loop;
+
+            Command_Last := Command_Last + 1;
+            Command (Command_Last) := ASCII.NUL;
+
+            Arg_List_Last := Arg_List_Last + 1;
+            Arg_List (Arg_List_Last) := Command (First)'Access;
+         end Add_To_Command;
+
+      --  Start of processing for Spawn
+
+      begin
+         Add_To_Command (Program_Name);
+
+         for J in Args'Range loop
+            Add_To_Command (Args (J).all);
+         end loop;
+
+         if Blocking then
+            Pid     := Invalid_Pid;
+            Result  := Portable_Spawn (Arg_List'Address);
+         else
+            Pid     := Portable_No_Block_Spawn (Arg_List'Address);
+            Result  := Boolean'Pos (Pid /= Invalid_Pid);
+         end if;
+      end Spawn;
 
    --  Start of processing for Spawn_Internal
 
    begin
-      Add_To_Command (Program_Name);
+      --  Copy arguments into a local structure
 
-      for J in Args'Range loop
-         Add_To_Command (Args (J).all);
+      for K in N_Args'Range loop
+         N_Args (K) := new String'(Args (K).all);
       end loop;
 
-      if Blocking then
-         Pid     := Invalid_Pid;
-         Result  := Portable_Spawn (Arg_List'Address);
-      else
-         Pid     := Portable_No_Block_Spawn (Arg_List'Address);
-         Result  := Boolean'Pos (Pid /= Invalid_Pid);
-      end if;
+      --  Normalize those arguments
+
+      Normalize_Arguments (N_Args);
 
+      --  Call spawn using the normalized arguments
+
+      Spawn (N_Args);
+
+      --  Free arguments list
+
+      for K in N_Args'Range loop
+         Free (N_Args (K));
+      end loop;
    end Spawn_Internal;
 
    ---------------------------