* 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]


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@50451 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 224 insertions, 37 deletions

diff --git a/gcc/ada/g-comlin.adb b/gcc/ada/g-comlin.adb
index f2ee9b8a054..16aea3f7330 100644
--- a/gcc/ada/g-comlin.adb
+++ b/gcc/ada/g-comlin.adb
@@ -6,9 +6,9 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---                            $Revision: 1.21 $
+--                            $Revision$
 --                                                                          --
---          Copyright (C) 1999-2001 Free Software Foundation, Inc.          --
+--          Copyright (C) 1999-2002 Free Software Foundation, 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- --
@@ -33,6 +33,7 @@
 ------------------------------------------------------------------------------
 
 with Ada.Command_Line;
+with GNAT.OS_Lib; use GNAT.OS_Lib;
 
 package body GNAT.Command_Line is
 
@@ -41,12 +42,11 @@ package body GNAT.Command_Line is
    type Section_Number is new Natural range 0 .. 65534;
    for Section_Number'Size use 16;
 
-   type Parameter_Type is
-      record
-         Arg_Num : Positive;
-         First   : Positive;
-         Last    : Positive;
-      end record;
+   type Parameter_Type is record
+      Arg_Num : Positive;
+      First   : Positive;
+      Last    : Positive;
+   end record;
    The_Parameter : Parameter_Type;
    The_Switch    : Parameter_Type;
    --  This type and this variable are provided to store the current switch
@@ -101,8 +101,39 @@ package body GNAT.Command_Line is
    --  Go to the next argument on the command line. If we are at the end
    --  of the current section, we want to make sure there is no other
    --  identical section on the command line (there might be multiple
-   --  instances of -largs).
-   --  Return True if there as another argument, False otherwise
+   --  instances of -largs). Returns True iff there is another argument.
+
+   function Get_File_Names_Case_Sensitive return Integer;
+   pragma Import (C, Get_File_Names_Case_Sensitive,
+                  "__gnat_get_file_names_case_sensitive");
+   File_Names_Case_Sensitive : constant Boolean :=
+                                 Get_File_Names_Case_Sensitive /= 0;
+
+   procedure Canonical_Case_File_Name (S : in out String);
+   --  Given a file name, converts it to canonical case form. For systems
+   --  where file names are case sensitive, this procedure has no effect.
+   --  If file names are not case sensitive (i.e. for example if you have
+   --  the file "xyz.adb", you can refer to it as XYZ.adb or XyZ.AdB), then
+   --  this call converts the given string to canonical all lower case form,
+   --  so that two file names compare equal if they refer to the same file.
+
+   ------------------------------
+   -- Canonical_Case_File_Name --
+   ------------------------------
+
+   procedure Canonical_Case_File_Name (S : in out String) is
+   begin
+      if not File_Names_Case_Sensitive then
+         for J in S'Range loop
+            if S (J) in 'A' .. 'Z' then
+               S (J) := Character'Val (
+                          Character'Pos (S (J)) +
+                          Character'Pos ('a')   -
+                          Character'Pos ('A'));
+            end if;
+         end loop;
+      end if;
+   end Canonical_Case_File_Name;
 
    ---------------
    -- Expansion --
@@ -116,17 +147,81 @@ package body GNAT.Command_Line is
       Last : Natural;
       It   : Pointer := Iterator'Unrestricted_Access;
 
+      Current : Depth := It.Current_Depth;
+      NL      : Positive;
+
    begin
+      --  It is assumed that a directory is opened at the current level;
+      --  otherwise, GNAT.Directory_Operations.Directory_Error will be raised
+      --  at the first call to Read.
+
       loop
-         Read (It.Dir, S, Last);
+         Read (It.Levels (Current).Dir, S, Last);
+
+         --  If we have exhausted the directory, close it and go back one level
 
          if Last = 0 then
-            Close (It.Dir);
-            return String'(1 .. 0 => ' ');
-         end if;
+            Close (It.Levels (Current).Dir);
+
+            --  If we are at level 1, we are finished; return an empty string.
+
+            if Current = 1 then
+               return String'(1 .. 0 => ' ');
+            else
+               --  Otherwise, continue with the directory at the previous level
+
+               Current := Current - 1;
+               It.Current_Depth := Current;
+            end if;
+
+         --  If this is a directory, that is neither "." or "..", attempt to
+         --  go to the next level.
+
+         elsif Is_Directory
+           (It.Dir_Name (1 .. It.Levels (Current).Name_Last) & S (1 .. Last))
+           and then S (1 .. Last) /= "."
+           and then S (1 .. Last) /= ".."
+         then
+            --  We can go to the next level only if we have not reached the
+            --  maximum depth,
+
+            if Current < It.Maximum_Depth then
+               NL := It.Levels (Current).Name_Last;
+
+               --  And if relative path of this new directory is not too long
+
+               if NL + Last + 1 < Max_Path_Length then
+                  Current := Current + 1;
+                  It.Current_Depth := Current;
+                  It.Dir_Name (NL + 1 .. NL + Last) := S (1 .. Last);
+                  NL := NL + Last + 1;
+                  It.Dir_Name (NL) := Directory_Separator;
+                  It.Levels (Current).Name_Last := NL;
+                  Canonical_Case_File_Name (It.Dir_Name (1 .. NL));
+
+                  --  Open the new directory, and read from it
 
-         if GNAT.Regexp.Match (S (1 .. Last), Iterator.Regexp) then
-            return S (1 .. Last);
+                  GNAT.Directory_Operations.Open
+                    (It.Levels (Current).Dir, It.Dir_Name (1 .. NL));
+               end if;
+            end if;
+
+         --  If not a directory, check the relative path against the pattern
+
+         else
+            declare
+               Name : String :=
+                 It.Dir_Name (It.Start .. It.Levels (Current).Name_Last) &
+                 S (1 .. Last);
+            begin
+               Canonical_Case_File_Name (Name);
+
+               --  If it matches, return the relative path
+
+               if GNAT.Regexp.Match (Name, Iterator.Regexp) then
+                  return Name;
+               end if;
+            end;
          end if;
 
       end loop;
@@ -155,13 +250,13 @@ package body GNAT.Command_Line is
       if In_Expansion then
          declare
             S : String := Expansion (Expansion_It);
+
          begin
             if S'Length /= 0 then
                return S;
             else
                In_Expansion := False;
             end if;
-
          end;
       end if;
 
@@ -206,7 +301,7 @@ package body GNAT.Command_Line is
 
       Current_Argument := Current_Argument + 1;
 
-      --  Could it be a file name with wild cards to expand ?
+      --  Could it be a file name with wild cards to expand?
 
       if Do_Expansion then
          declare
@@ -238,16 +333,16 @@ package body GNAT.Command_Line is
    ------------
 
    function Getopt (Switches : String) return Character is
-      Dummy          : Boolean;
+      Dummy : Boolean;
 
    begin
-      --  If we have finished to parse the current command line item (there
+      --  If we have finished parsing the current command line item (there
       --  might be multiple switches in a single item), then go to the next
       --  element
 
       if Current_Argument > CL.Argument_Count
         or else (Current_Index > CL.Argument (Current_Argument)'Last
-                 and then not Goto_Next_Argument_In_Section)
+                   and then not Goto_Next_Argument_In_Section)
       then
          return ASCII.NUL;
       end if;
@@ -302,9 +397,10 @@ package body GNAT.Command_Line is
                Length := Length + 1;
             end loop;
 
-            if (Switches (Length - 1) = ':'
-                or else Switches (Length - 1) = '?'
-                or else Switches (Length - 1) = '!')
+            if (Switches (Length - 1) = ':'  or else
+                Switches (Length - 1) = '='  or else
+                Switches (Length - 1) = '?'  or else
+                Switches (Length - 1) = '!')
               and then Length > Index + 1
             then
                Length := Length - 1;
@@ -314,8 +410,8 @@ package body GNAT.Command_Line is
 
             if Current_Index + Length - 1 - Index <= Arg'Last
               and then
-              Switches (Index .. Length - 1) =
-              Arg (Current_Index .. Current_Index + Length - 1 - Index)
+                Switches (Index .. Length - 1) =
+                  Arg (Current_Index .. Current_Index + Length - 1 - Index)
               and then Length - Index > Max_Length
             then
                Index_Switches := Index;
@@ -323,18 +419,18 @@ package body GNAT.Command_Line is
             end if;
 
             --  Look for the next switch in Switches
+
             while Index <= Switches'Last
               and then Switches (Index) /= ' ' loop
                Index := Index + 1;
             end loop;
-            Index := Index + 1;
 
+            Index := Index + 1;
          end loop;
 
          End_Index := Current_Index + Max_Length - 1;
 
-         --  If the switch is not accepted, skip it, unless we had a '*' in
-         --  Switches
+         --  If switch is not accepted, skip it, unless we had '*' in Switches
 
          if Index_Switches = 0 then
             if Switches (Switches'First) = '*' then
@@ -360,7 +456,7 @@ package body GNAT.Command_Line is
                         First   => Current_Index,
                         Last    => End_Index);
 
-         --  If switch needs an argument
+         --  Case of switch needs an argument
 
          if Index_Switches + Max_Length <= Switches'Last then
 
@@ -390,6 +486,43 @@ package body GNAT.Command_Line is
                      raise Invalid_Parameter;
                   end if;
 
+               when '=' =>
+
+                  --  If the switch is of the form <switch>=xxx
+
+                  if End_Index < Arg'Last then
+
+                     if Arg (End_Index + 1) = '='
+                       and then End_Index + 1 < Arg'Last
+                     then
+                        Set_Parameter (The_Parameter,
+                                       Arg_Num => Current_Argument,
+                                       First   => End_Index + 2,
+                                       Last    => Arg'Last);
+                        Dummy := Goto_Next_Argument_In_Section;
+
+                     else
+                        Current_Index := End_Index + 1;
+                        raise Invalid_Parameter;
+                     end if;
+
+                  --  If the switch is of the form <switch> xxx
+
+                  elsif Section (Current_Argument + 1) /= 0 then
+                     Set_Parameter
+                       (The_Parameter,
+                        Arg_Num => Current_Argument + 1,
+                        First   => 1,
+                        Last    => CL.Argument (Current_Argument + 1)'Last);
+                     Current_Argument := Current_Argument + 1;
+                     Is_Switch (Current_Argument) := True;
+                     Dummy := Goto_Next_Argument_In_Section;
+
+                  else
+                     Current_Index := End_Index + 1;
+                     raise Invalid_Parameter;
+                  end if;
+
                when '!' =>
 
                   if End_Index < Arg'Last then
@@ -447,6 +580,7 @@ package body GNAT.Command_Line is
             if Current_Argument > CL.Argument_Count then
                return False;
             end if;
+
             Current_Argument := Current_Argument + 1;
             exit when Section (Current_Argument) = Current_Section;
          end loop;
@@ -478,6 +612,7 @@ package body GNAT.Command_Line is
          then
             Current_Argument := Index + 1;
             Current_Index    := 1;
+
             if Current_Argument <= CL.Argument_Count then
                Current_Section := Section (Current_Argument);
             end if;
@@ -486,6 +621,7 @@ package body GNAT.Command_Line is
 
          Index := Index + 1;
       end loop;
+
       Current_Argument := Positive'Last;
       Current_Index := 2;   --  so that Get_Argument returns nothing
    end Goto_Section;
@@ -529,8 +665,10 @@ package body GNAT.Command_Line is
 
          for Index in 1 .. CL.Argument_Count loop
             if CL.Argument (Index)(1) = Switch_Character
-              and then CL.Argument (Index) = Switch_Character
-              & Section_Delimiters (Section_Index .. Last - 1)
+              and then
+                CL.Argument (Index) = Switch_Character &
+                                        Section_Delimiters
+                                          (Section_Index .. Last - 1)
             then
                Section (Index) := 0;
                Delimiter_Found := True;
@@ -576,7 +714,8 @@ package body GNAT.Command_Line is
      (Variable : out Parameter_Type;
       Arg_Num  : Positive;
       First    : Positive;
-      Last     : Positive) is
+      Last     : Positive)
+   is
    begin
       Variable.Arg_Num := Arg_Num;
       Variable.First   := First;
@@ -595,16 +734,64 @@ package body GNAT.Command_Line is
    is
       Directory_Separator : Character;
       pragma Import (C, Directory_Separator, "__gnat_dir_separator");
+      First : Positive := Pattern'First;
+
+      Pat : String := Pattern;
 
    begin
+      Canonical_Case_File_Name (Pat);
+      Iterator.Current_Depth := 1;
+
+      --  If Directory is unspecified, use the current directory ("./" or ".\")
+
       if Directory = "" then
-         GNAT.Directory_Operations.Open
-           (Iterator.Dir, "." & Directory_Separator);
+         Iterator.Dir_Name (1 .. 2) := "." & Directory_Separator;
+         Iterator.Start := 3;
+
       else
-         GNAT.Directory_Operations.Open (Iterator.Dir, Directory);
+         Iterator.Dir_Name (1 .. Directory'Length) := Directory;
+         Iterator.Start := Directory'Length + 1;
+         Canonical_Case_File_Name (Iterator.Dir_Name (1 .. Directory'Length));
+
+         --  Make sure that the last character is a directory separator
+
+         if Directory (Directory'Last) /= Directory_Separator then
+            Iterator.Dir_Name (Iterator.Start) := Directory_Separator;
+            Iterator.Start := Iterator.Start + 1;
+         end if;
+      end if;
+
+      Iterator.Levels (1).Name_Last := Iterator.Start - 1;
+
+      --  Open the initial Directory, at depth 1
+
+      GNAT.Directory_Operations.Open
+        (Iterator.Levels (1).Dir, Iterator.Dir_Name (1 .. Iterator.Start - 1));
+
+      --  If in the current directory and the pattern starts with "./",
+      --  drop the "./" from the pattern.
+
+      if Directory = "" and then Pat'Length > 2
+        and then Pat (Pat'First .. Pat'First + 1) = "./"
+      then
+         First := Pat'First + 2;
       end if;
 
-      Iterator.Regexp := GNAT.Regexp.Compile (Pattern, Basic_Regexp, True);
+      Iterator.Regexp :=
+        GNAT.Regexp.Compile (Pat (First .. Pat'Last), Basic_Regexp, True);
+
+      Iterator.Maximum_Depth := 1;
+
+      --  Maximum_Depth is equal to 1 plus the number of directory separators
+      --  in the pattern.
+
+      for Index in First .. Pat'Last loop
+         if Pat (Index) = Directory_Separator then
+            Iterator.Maximum_Depth := Iterator.Maximum_Depth + 1;
+            exit when Iterator.Maximum_Depth = Max_Depth;
+         end if;
+      end loop;
+
    end Start_Expansion;
 
 begin