a-secain.adb, [...]: Minor reformatting

2005-11-14  Robert Dewar  <dewar@adacore.com>

	* a-secain.adb, a-slcain.adb, a-shcain.adb, a-chtgke.ads, a-chtgke.adb,
	a-stwiha.adb, a-strhas.adb, a-chzla1.ads, a-chzla9.ads, a-stzbou.adb,
	a-stzbou.ads, a-stzfix.adb, a-stzhas.adb, a-stzmap.adb, a-stzmap.ads,
	a-stzsea.adb, a-stzsea.ads, a-stzsup.adb, a-stzsup.ads, a-stzunb.adb,
	a-stzunb.ads, a-szuzha.adb, a-szuzha.ads, a-szuzti.adb, a-szuzti.ads,
	a-ztcoau.adb, a-ztcoau.ads, a-ztcoio.adb, a-ztcstr.adb, a-ztcstr.ads,
	a-ztdeau.adb, a-ztdeau.ads, a-ztdeio.adb, a-ztdeio.ads, a-ztedit.adb,
	a-ztedit.ads, a-ztenau.ads, a-ztenio.adb, a-ztenio.ads, a-ztexio.adb,
	a-ztexio.ads, a-ztfiio.adb, a-ztfiio.ads, a-ztflau.adb, a-ztflau.ads,
	a-ztflio.adb, a-ztflio.ads, a-ztgeau.adb, a-ztgeau.ads, a-ztinau.adb,
	a-ztinau.ads, a-ztinio.adb, a-ztmoau.ads, a-ztmoio.adb, a-ztmoio.ads,
	a-zttest.adb, g-enblsp-vms-alpha.adb, g-enblsp-vms-alpha.adb,
	g-enblsp-vms-ia64.adb, g-enblsp-vms-ia64.adb, system-linux-hppa.ads,
	a-chacon.adb, a-chacon.ads, a-wichun.adb, a-wichun.ads, a-zchuni.adb,
	a-zchuni.ads, g-trasym-vms-alpha.adb, g-trasym-vms-ia64.adb,
	system-hpux-ia64.ads, g-soccon-unixware.ads, g-soliop-unixware.ads,
	g-soccon-interix.ads, g-soliop-solaris.ads, g-eacodu-vms.adb,
	g-expect-vms.adb, g-socthi-vms.adb, g-soliop-mingw.ads,
	a-intnam-unixware.ads, a-intnam-lynxos.ads, a-intnam-tru64.ads,
	a-intnam-aix.ads, a-intnam-linux.ads, a-intnam-linux.ads,
	a-intnam-dummy.ads, a-numaux-libc-x86.ads, a-intnam-interix.ads,
	a-intnam-solaris.ads, a-calend-vms.adb, a-calend-vms.ads,
	a-intnam-vms.ads, a-calend-mingw.adb, a-intnam-mingw.ads,
	a-intnam-vxworks.ads, a-numaux-vxworks.ads, system-unixware.ads,
	system-linux-ia64.ads, a-intnam-freebsd.ads, system-freebsd-x86.ads,
	system-lynxos-ppc.ads, system-linux-x86_64.ads, a-stunha.adb,
	a-cgaaso.ads, a-cgaaso.adb, a-chtgop.adb, a-cgcaso.adb, a-cgarso.adb,
	a-cohata.ads, a-crbtgk.adb, a-crbltr.ads, a-coprnu.adb, a-rbtgso.adb,
	a-intnam-darwin.ads, system-darwin-ppc.ads, gprmake.adb, makegpr.ads,
	system-tru64.ads, system-aix.ads, system-solaris-x86.ads,
	system-irix-o32.ads, s-interr-sigaction.adb, system-irix-n32.ads,
	s-parame-mingw.adb, system-hpux.ads, s-traceb-hpux.adb,
	system-linux-x86.ads, s-inmaop-dummy.adb, system-os2.ads,
	system-interix.ads, system-solaris-sparc.ads,
	system-solaris-sparcv9.ads, s-inmaop-vms.adb,
	s-mastop-vms.adb, expander.adb, expander.ads, s-gloloc-mingw.adb,
	system-mingw.ads, system-vms-zcx.ads, s-osinte-fsu.adb,
	s-traceb-mastop.adb, a-exextr.adb, a-exstat.adb, a-filico.ads,
	a-finali.ads, a-interr.ads, a-intsig.adb, a-intsig.ads,
	a-except.ads, a-numaux-x86.ads, a-astaco.adb, a-calend.adb,
	a-calend.ads, a-chahan.adb, a-chahan.ads, a-chlat9.ads,
	a-colien.adb, a-colien.ads, a-colire.adb, a-colire.ads,
	a-comlin.adb, a-comlin.ads, a-cwila1.ads, a-cwila9.ads,
	a-elchha.adb, a-decima.adb, a-decima.ads, a-diocst.ads,
	a-direio.adb, a-direio.ads, a-excach.adb, a-excach.adb,
	a-exctra.ads, ali-util.adb, a-ngcefu.adb, a-ngcoty.adb,
	a-ngcoty.ads, a-nudira.adb, a-nudira.ads, a-nuflra.adb,
	a-numaux.ads, a-reatim.ads, a-sequio.adb, a-sequio.ads,
	a-siocst.ads, a-ssicst.ads, a-stmaco.ads, a-storio.adb,
	a-strbou.adb, a-strbou.ads, a-stream.ads, a-strfix.adb,
	a-strmap.adb, a-strmap.ads, a-strsea.adb, a-strsea.ads,
	a-strsup.adb, a-strsup.ads, a-strunb.adb, a-strunb.ads,
	a-stwibo.adb, a-stwibo.ads, a-stwifi.adb, a-stwima.adb,
	a-stwima.ads, a-stwise.adb, a-stwise.ads, a-stwisu.adb,
	a-stwisu.ads, a-stwiun.adb, a-stwiun.ads, a-suteio.adb,
	a-suteio.ads, a-swmwco.ads, a-swuwti.adb, a-swuwti.ads,
	a-sytaco.adb, a-sytaco.ads, a-tasatt.adb, a-taside.adb,
	a-taside.ads, a-teioed.adb, a-textio.adb, a-textio.ads,
	a-ticoau.adb, a-ticoau.ads, a-ticoio.adb, a-tideau.adb,
	a-tideio.adb, a-tienau.adb, a-tienio.adb, a-tifiio.adb,
	a-tiflio.adb, a-tigeau.adb, a-tigeau.ads, a-tiinau.adb,
	a-tiinio.adb, a-timoau.adb, a-timoio.adb, a-timoio.ads,
	a-tiocst.ads, a-titest.adb, atree.adb, a-witeio.adb,
	a-witeio.ads, a-wtcoau.adb, a-wtcoau.ads, a-wtcoio.adb,
	a-wtcstr.ads, a-wtdeau.adb, a-wtdeio.adb, a-wtedit.adb,
	a-wtedit.ads, a-wtenau.adb, a-wtenio.adb, a-wtfiio.adb,
	a-wtflio.adb, a-wtgeau.adb, a-wtinau.adb, a-wtinio.adb,
	a-wtmoau.adb, a-wtmoio.adb, a-wttest.adb, back_end.adb,
	bindgen.adb, butil.adb, butil.ads, checks.ads, cio.c, comperr.adb,
	csets.ads, cstand.adb, debug.ads, elists.ads, errno.c, errout.adb,
	errout.ads, erroutc.adb, erroutc.ads, errutil.adb, errutil.ads,
	errutil.ads, err_vars.ads, eval_fat.adb, exp_ch11.adb, exp_ch11.ads,
	exp_ch2.adb, exp_ch7.ads, exp_imgv.ads, exp_pakd.adb, exp_prag.adb,
	exp_prag.ads, exp_tss.adb, exp_tss.ads, exp_vfpt.ads, fe.h, fmap.adb,
	freeze.ads, frontend.adb, frontend.ads, g-arrspl.adb, g-arrspl.ads,
	g-awk.adb, g-awk.ads, g-boumai.ads, g-calend.adb, g-calend.ads,
	g-catiio.adb, g-comlin.adb, g-comlin.ads, g-comlin.ads, g-comlin.ads,
	g-comver.adb, g-crc32.adb, g-crc32.ads, g-ctrl_c.ads, g-curexc.ads,
	g-debpoo.ads, g-debuti.adb, g-diopit.adb, g-diopit.ads, g-dirope.adb,
	g-dirope.ads, g-dyntab.adb, g-dyntab.ads, g-excact.adb, g-excact.ads,
	g-except.ads, g-exctra.adb, g-exctra.ads, g-expect.ads, g-flocon.ads,
	g-hesorg.ads, g-io.adb, g-locfil.ads, g-md5.adb, g-md5.ads, g-md5.ads,
	g-moreex.adb, g-signal.ads, g-signal.adb, gnatbind.ads, gnatchop.adb,
	gnatcmd.adb, gnatfind.adb, gnatlbr.adb, gnatmake.ads, gnatmem.adb,
	gnatprep.adb, gnatprep.ads, gnatsym.adb, gnatxref.adb, g-os_lib.adb,
	g-os_lib.ads, g-pehage.adb, g-pehage.ads, gprep.ads, g-regexp.adb,
	g-regexp.ads, g-regist.adb, g-regist.ads, g-regpat.ads, g-semaph.adb,
	g-socthi.adb, g-soliop.ads, g-spipat.adb, g-spipat.ads, g-sptabo.ads,
	g-sptain.ads, g-sptavs.ads, g-string.ads, g-tasloc.adb, g-tasloc.ads,
	g-trasym.adb, g-trasym.ads, i-fortra.adb, i-fortra.ads, inline.adb,
	layout.adb, live.adb, make.ads, makeutl.ads, makeutl.adb, mdll-fil.adb,
	mdll-fil.ads, mdll-utl.ads, memroot.ads, memtrack.adb, mlib.ads,
	mlib-fil.adb, mlib-fil.ads, mlib-prj.ads, mlib-utl.adb, mlib-utl.ads,
	nlists.adb, nlists.ads, osint.adb, osint.ads, osint-c.adb, osint-l.adb,
	osint-l.ads, osint-m.ads, output.adb, par.adb, par.adb, par.ads,
	par-ch11.adb, par-ch12.adb, par-ch2.adb, par-ch4.adb, par-ch5.adb,
	par-ch6.adb, par-ch9.adb, par-endh.adb, par-labl.adb, par-load.adb,
	par-tchk.adb, prep.adb, prepcomp.adb, prepcomp.ads, prj-attr.ads,
	prj-com.ads, prj-dect.adb, prj-dect.ads, prj-env.ads, prj-err.ads,
	prj-ext.ads, prj-makr.adb, prj-makr.ads, prj-nmsc.ads, prj-pars.adb,
	prj-pars.ads, prj-part.ads, prj-pp.ads, prj-proc.ads, prj-strt.adb,
	prj-strt.ads, prj-tree.adb, prj-util.adb, prj-util.ads, rtsfind.adb,
	sem.adb, sem.ads, sem_case.adb, sem_case.ads, sem_ch11.adb,
	sem_ch4.adb, sem_ch6.ads, sem_ch7.ads, sem_dist.ads, sem_elab.ads,
	sem_elim.ads, sem_eval.ads, sem_intr.ads, sem_maps.adb, sem_maps.ads,
	sem_maps.ads, sem_res.ads, sem_type.ads, sfn_scan.adb, sfn_scan.ads,
	s-imgwch.ads, s-imgwiu.adb, s-imgwiu.ads, s-inmaop.ads, sinput.adb,
	sinput.ads, s-pack03.adb, s-pack03.ads, s-pack05.adb, s-pack05.ads,
	s-pack06.adb, s-pack06.ads, s-pack07.adb, s-pack07.ads, s-pack09.adb,
	s-pack09.ads, s-pack10.adb, s-pack10.ads, s-pack11.adb, s-pack11.ads,
	s-pack12.adb, s-pack12.ads, s-pack13.adb, s-pack13.ads, s-pack14.adb,
	s-pack14.ads, s-pack15.adb, s-pack15.ads, s-pack17.adb, s-pack17.ads,
	s-pack18.adb, s-pack18.ads, s-pack19.adb, s-pack19.ads, s-pack20.adb,
	s-pack20.ads, s-pack21.adb, s-pack21.ads, s-pack22.adb, s-pack22.ads,
	s-pack23.adb, s-pack23.ads, s-pack24.adb, s-pack24.ads, s-pack25.adb,
	s-pack25.ads, s-pack26.adb, s-pack26.ads, s-pack27.adb, s-pack27.ads,
	s-pack28.adb, s-pack28.ads, s-pack29.adb, s-pack29.ads, s-pack30.adb,
	s-pack30.ads, s-pack31.adb, s-pack31.ads, s-pack33.adb, s-pack33.ads,
	s-pack34.adb, s-pack34.ads, s-pack35.adb, s-pack35.ads, s-pack36.adb,
	s-pack36.ads, s-pack37.adb, s-pack37.ads, s-pack38.adb, s-pack38.ads,
	s-pack39.adb, s-pack39.ads, s-pack40.adb, s-pack40.ads, s-pack41.adb,
	s-pack41.ads, s-pack42.adb, s-pack42.ads, s-pack43.adb, s-pack43.ads,
	s-pack44.adb, s-pack44.ads, s-pack45.adb, s-pack45.ads, s-pack46.adb,
	s-pack46.ads, s-pack47.adb, s-pack47.ads, s-pack48.adb, s-pack48.ads,
	s-pack49.adb, s-pack49.ads, s-pack50.adb, s-pack50.ads, s-pack51.adb,
	s-pack51.ads, s-pack52.adb, s-pack52.ads, s-pack53.adb, s-pack53.ads,
	s-pack54.adb, s-pack54.ads, s-pack55.adb, s-pack55.ads, s-pack56.adb,
	s-pack56.ads, s-pack57.adb, s-pack57.ads, s-pack58.adb, s-pack58.ads,
	s-pack59.adb, s-pack59.ads, s-pack60.adb, s-pack60.adb, s-pack60.ads,
	s-pack61.adb, s-pack61.ads, s-pack62.adb, s-pack62.ads, s-pack63.adb,
	s-pack63.ads, s-parint.adb, s-parint.adb, s-parint.ads, sprint.ads,
	s-purexc.ads, s-restri.ads, s-restri.adb, s-scaval.adb, s-scaval.ads,
	s-secsta.adb, s-secsta.ads, s-sequio.adb, s-sequio.ads, stand.ads,
	s-tasuti.adb, s-traceb.adb, s-traceb.ads, stringt.adb, stringt.ads,
	styleg.ads, s-valboo.adb, s-valboo.ads, s-valcha.adb, s-valcha.ads,
	s-valdec.adb, s-valdec.ads, s-valint.adb, s-valint.ads, s-valint.ads,
	s-vallld.adb, s-vallld.ads, s-vallli.adb, s-vallli.ads, s-valllu.adb,
	s-valllu.ads, s-valrea.adb, s-valrea.ads, s-valuns.adb, s-valuns.ads,
	s-valuti.adb, s-valuti.ads, s-valwch.ads, s-veboop.adb, s-veboop.ads,
	s-vercon.adb, s-vercon.ads, s-wchcnv.adb, s-wchcnv.ads, s-wchcon.ads,
	s-wchjis.adb, s-wchjis.ads, s-wchstw.adb, s-wchstw.adb, s-wchstw.ads,
	s-wchwts.adb, s-wchwts.ads, s-widboo.adb, s-widboo.ads, s-widcha.adb,
	s-widcha.ads, s-widenu.adb, s-widenu.ads, s-widlli.adb, s-widlli.ads,
	s-widllu.adb, s-widllu.ads, s-widwch.adb, s-widwch.ads, s-wwdcha.adb,
	s-wwdcha.ads, s-wwdenu.adb, s-wwdenu.ads, symbols.adb, symbols.ads,
	table.ads, targparm.adb, targparm.ads, tb-alvms.c, tb-alvxw.c,
	tbuild.adb, tree_io.ads, treepr.adb, treeprs.adt, ttypef.ads,
	ttypes.ads, types.adb, uintp.adb, uintp.ads, uname.ads, urealp.ads,
	usage.ads, validsw.ads, vxaddr2line.adb, widechar.adb, widechar.ads,
	xeinfo.adb, xnmake.adb, xref_lib.ads, xr_tabls.adb, xr_tabls.ads,
	xsinfo.adb, xtreeprs.adb, xsnames.adb, vms_conv.ads, vms_conv.adb,
	a-dirval.ads, a-dirval.adb, a-dirval-mingw.adb, a-direct.ads,
	a-direct.adb, indepsw.ads, prj-attr-pm.ads, system-linux-ppc.ads,
	a-numaux-darwin.ads, a-numaux-darwin.adb,
	a-swuwha.ads, a-stunha.ads: Minor reformatting

From-SVN: r107016

1 files changed, 50 insertions, 68 deletions

diff --git a/gcc/ada/g-os_lib.adb b/gcc/ada/g-os_lib.adb
index 825c05c..80db696 100644
--- a/gcc/ada/g-os_lib.adb
+++ b/gcc/ada/g-os_lib.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---           Copyright (C) 1995-2005 Ada Core Technologies, Inc.            --
+--                     Copyright (C) 1995-2005, AdaCore                     --
 --                                                                          --
 -- 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- --
@@ -98,13 +98,14 @@ package body GNAT.OS_Lib is
       Blocking     : Boolean);
    --  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.
+   --  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: 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;
@@ -250,10 +251,8 @@ package body GNAT.OS_Lib is
    ---------------------
 
    function C_String_Length (S : Address) return Integer is
-
       function Strlen (S : Address) return Integer;
       pragma Import (C, Strlen, "strlen");
-
    begin
       if S = Null_Address then
          return 0;
@@ -333,6 +332,8 @@ package body GNAT.OS_Lib is
             return C = Directory_Separator or else C = '/';
          end Is_Dirsep;
 
+      --  Start of processing for Build_Path
+
       begin
          --  Find base file name
 
@@ -504,8 +505,7 @@ package body GNAT.OS_Lib is
                   Dest : constant String := Build_Path (Pathname, Name);
 
                begin
-                  --  If the target file exists, we have an error
-                  --  otherwise do the copy.
+                  --  If target file exists, we have an error, else do copy
 
                   if Is_Regular_File (Dest) then
                      raise Copy_Error;
@@ -520,7 +520,7 @@ package body GNAT.OS_Lib is
                Copy_To (Pathname);
             end if;
 
-         --  Overwrite case, destination file may or may not exist
+         --  Overwrite case (destination file may or may not exist)
 
          when Overwrite =>
             if Is_Directory (Pathname) then
@@ -529,7 +529,7 @@ package body GNAT.OS_Lib is
                Copy_To (Pathname);
             end if;
 
-         --  Appending case, destination file may or may not exist
+         --  Append case (destination file may or may not exist)
 
          when Append =>
 
@@ -537,8 +537,8 @@ package body GNAT.OS_Lib is
 
             if Is_Regular_File (Pathname) then
 
-               --  Append mode and destination file exists, append data
-               --  at the end of Pathname.
+               --  Append mode and destination file exists, append data at the
+               --  end of Pathname.
 
                From := Open_Read (Name, Binary);
                To   := Open_Read_Write (Pathname, Binary);
@@ -857,7 +857,6 @@ package body GNAT.OS_Lib is
    function File_Time_Stamp (FD : File_Descriptor) return OS_Time is
       function File_Time (FD    : File_Descriptor) return OS_Time;
       pragma Import (C, File_Time, "__gnat_file_time_fd");
-
    begin
       return File_Time (FD);
    end File_Time_Stamp;
@@ -865,14 +864,12 @@ package body GNAT.OS_Lib is
    function File_Time_Stamp (Name : C_File_Name) return OS_Time is
       function File_Time (Name : Address) return OS_Time;
       pragma Import (C, File_Time, "__gnat_file_time_name");
-
    begin
       return File_Time (Name);
    end File_Time_Stamp;
 
    function File_Time_Stamp (Name : String) return OS_Time is
       F_Name : String (1 .. Name'Length + 1);
-
    begin
       F_Name (1 .. Name'Length) := Name;
       F_Name (F_Name'Last)      := ASCII.NUL;
@@ -1152,7 +1149,6 @@ package body GNAT.OS_Lib is
         (Name   : Address;
          Length : Integer) return Integer;
       pragma Import (C, Is_Absolute_Path, "__gnat_is_absolute_path");
-
    begin
       return Is_Absolute_Path (Name'Address, Name'Length) /= 0;
    end Is_Absolute_Path;
@@ -1164,14 +1160,12 @@ package body GNAT.OS_Lib is
    function Is_Directory (Name : C_File_Name) return Boolean is
       function Is_Directory (Name : Address) return Integer;
       pragma Import (C, Is_Directory, "__gnat_is_directory");
-
    begin
       return Is_Directory (Name) /= 0;
    end Is_Directory;
 
    function Is_Directory (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;
@@ -1185,14 +1179,12 @@ package body GNAT.OS_Lib is
    function Is_Regular_File (Name : C_File_Name) return Boolean is
       function Is_Regular_File (Name : Address) return Integer;
       pragma Import (C, Is_Regular_File, "__gnat_is_regular_file");
-
    begin
       return Is_Regular_File (Name) /= 0;
    end Is_Regular_File;
 
    function Is_Regular_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;
@@ -1206,14 +1198,12 @@ package body GNAT.OS_Lib is
    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;
@@ -1227,14 +1217,12 @@ package body GNAT.OS_Lib is
    function Is_Writable_File (Name : C_File_Name) return Boolean is
       function Is_Writable_File (Name : Address) return Integer;
       pragma Import (C, Is_Writable_File, "__gnat_is_writable_file");
-
    begin
       return Is_Writable_File (Name) /= 0;
    end Is_Writable_File;
 
    function Is_Writable_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;
@@ -1248,14 +1236,12 @@ package body GNAT.OS_Lib is
    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;
@@ -1370,18 +1356,15 @@ package body GNAT.OS_Lib is
       return                   Process_Id
    is
       Saved_Output : File_Descriptor;
-      Saved_Error  : File_Descriptor := Invalid_FD;
-      --  We need to initialize Saved_Error to Invalid_FD to avoid
-      --  a compiler warning that this variable may be used before
-      --  it is initialized (which can not happen, but the compiler
-      --  is not smart enough to figure this out).
-      Pid           : Process_Id;
+      Saved_Error  : File_Descriptor := Invalid_FD; -- prevent warning
+      Pid          : Process_Id;
    begin
       if Output_File_Descriptor = Invalid_FD then
          return Invalid_Pid;
       end if;
 
       --  Set standard output and, if specified, error to the temporary file
+
       Saved_Output := Dup (Standout);
       Dup2 (Output_File_Descriptor, Standout);
 
@@ -1417,11 +1400,10 @@ package body GNAT.OS_Lib is
      (Program_Name : String;
       Args         : Argument_List;
       Output_File  : String;
-      Err_To_Out   : Boolean := True)
-      return         Process_Id
+      Err_To_Out   : Boolean := True) return Process_Id
    is
       Output_File_Descriptor : constant File_Descriptor :=
-        Create_Output_Text_File (Output_File);
+                                 Create_Output_Text_File (Output_File);
       Result : Process_Id;
 
    begin
@@ -1531,6 +1513,8 @@ package body GNAT.OS_Lib is
          end if;
       end Quote_Argument;
 
+   --  Start of processing for Normalize_Arguments
+
    begin
       if Argument_Needs_Quote then
          for K in Args'Range loop
@@ -1857,6 +1841,7 @@ package body GNAT.OS_Lib is
             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));
@@ -1890,13 +1875,13 @@ package body GNAT.OS_Lib is
 
       --  Start the conversions
 
-      --  If this is not finished after Max_Iterations, give up and
-      --  return an empty string.
+      --  If this is not finished after Max_Iterations, give up and return an
+      --  empty string.
 
       for J in 1 .. Max_Iterations loop
 
-         --  If we don't have an absolute pathname, prepend
-         --  the directory Reference_Dir.
+         --  If we don't have an absolute pathname, prepend the directory
+         --  Reference_Dir.
 
          if Last = 1
            and then not Is_Absolute_Path (Path_Buffer (1 .. End_Path))
@@ -1946,8 +1931,8 @@ package body GNAT.OS_Lib is
             end if;
          end loop;
 
-         --  Find the end of the current field: last character
-         --  or the one preceding the next directory separator.
+         --  Find the end of the current field: last character or the one
+         --  preceding the next directory separator.
 
          while Finish < End_Path
            and then Path_Buffer (Finish + 1) /= Directory_Separator
@@ -2058,11 +2043,10 @@ package body GNAT.OS_Lib is
 
       --  Too many iterations: give up
 
-      --  This can happen when there is a circularity in the symbolic links:
-      --  A is a symbolic link for B, which itself is a symbolic link, and
-      --  the target of B or of another symbolic link target of B is A.
-      --  In this case, we return an empty string to indicate failure to
-      --  resolve.
+      --  This can happen when there is a circularity in the symbolic links: A
+      --  is a symbolic link for B, which itself is a symbolic link, and the
+      --  target of B or of another symbolic link target of B is A. In this
+      --  case, we return an empty string to indicate failure to resolve.
 
       return "";
    end Normalize_Pathname;
@@ -2126,9 +2110,9 @@ package body GNAT.OS_Lib is
    ----------
 
    function Read
-     (FD   : File_Descriptor;
-      A    : System.Address;
-      N    : Integer) return Integer
+     (FD : File_Descriptor;
+      A  : System.Address;
+      N  : Integer) return Integer
    is
    begin
       return Integer (System.CRTL.read
@@ -2279,11 +2263,7 @@ package body GNAT.OS_Lib is
       Err_To_Out             : Boolean := True)
    is
       Saved_Output : File_Descriptor;
-      Saved_Error  : File_Descriptor := Invalid_FD;
-      --  We need to initialize Saved_Error to Invalid_FD to avoid
-      --  a compiler warning that this variable may be used before
-      --  it is initialized (which can not happen, but the compiler
-      --  is not smart enough to figure this out).
+      Saved_Error  : File_Descriptor := Invalid_FD; -- prevent compiler warning
 
    begin
       --  Set standard output and error to the temporary file
@@ -2373,15 +2353,15 @@ package body GNAT.OS_Lib is
                                               + 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
+         --  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.
+         --  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
@@ -2403,8 +2383,10 @@ package body GNAT.OS_Lib is
          begin
             Command_Last := Command_Last + S'Length;
 
-            --  Move characters one at a time, because Command has
-            --  aliased components.
+            --  Move characters one at a time, because Command has aliased
+            --  components.
+
+            --  But not volatile, so why is this necessary ???
 
             for J in S'Range loop
                Command (First + J - S'First) := S (J);
@@ -2509,9 +2491,9 @@ package body GNAT.OS_Lib is
    -----------
 
    function Write
-     (FD   : File_Descriptor;
-      A    : System.Address;
-      N    : Integer) return Integer
+     (FD : File_Descriptor;
+      A  : System.Address;
+      N  : Integer) return Integer
    is
    begin
       return Integer (System.CRTL.write