[Dotgnu-pnet-commits] CVS: pnetlib/runtime/System/IO Directory.cs, 1.19, 1.20

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnetlib/runtime/System/IO
In directory subversions:/tmp/cvs-serv11227/runtime/System/IO

Modified Files:
        Directory.cs 
Log Message:


Return the combined path for the results of "Directory.GetFiles" and
"Directory.GetDirectories" rather than just the relative path (bug #4644).


Index: Directory.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/IO/Directory.cs,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** Directory.cs        18 Aug 2003 06:42:46 -0000      1.19
--- Directory.cs        18 Aug 2003 07:55:53 -0000      1.20
***************
*** 315,319 ****
                                                continue;
                                        }
!                                       list.Add(filename);
                                }
  
--- 315,319 ----
                                                continue;
                                        }
!                                       list.Add(Path.Combine(path, filename));
                                }
  
***************
*** 403,411 ****
                                        if(type == FileType.directory)
                                        {
!                                               list.Add(new 
DirectoryInfo(filename));
                                        }
                                        else
                                        {
!                                               list.Add(new 
FileInfo(filename));
                                        }
                                }
--- 403,412 ----
                                        if(type == FileType.directory)
                                        {
!                                               list.Add(new DirectoryInfo
!                                                                       
(Path.Combine(path, filename)));
                                        }
                                        else
                                        {
!                                               list.Add(new 
FileInfo(Path.Combine(path, filename)));
                                        }
                                }