2007-04-05 Dick Porter <dick@ximian.com>

	* Directory.cs: Pass combined path and pattern to
	MonoIO.GetFileSystemEntries()

2007-04-05  Dick Porter  <dick@ximian.com>

	* Environment.cs: Increment mono_corlib_version

svn path=/trunk/mcs/; revision=75432

diff --git a/mcs/class/corlib/System.IO/ChangeLog b/mcs/class/corlib/System.IO/ChangeLog
index 2f76d8ef6da3928140b9781267b5007db609da54..d53b841736a20a2ee692637b8439be43516c32f8 100644 (file)
--- a/mcs/class/corlib/System.IO/ChangeLog
+++ b/mcs/class/corlib/System.IO/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-05  Dick Porter  <dick@ximian.com>
+
+       * Directory.cs: Pass combined path and pattern to
+       MonoIO.GetFileSystemEntries()
+
 2007-04-03  Alp Toker  <alp@atoker.com>
 
        * UnmanagedMemoryStream.cs: Should not have a public Dispose().

diff --git a/mcs/class/corlib/System.IO/Directory.cs b/mcs/class/corlib/System.IO/Directory.cs
index 4893e01b4c575fd07aa0b5cf92b68493b640907e..a802b10c8c840df7c7cc68792e43cede60e0b0aa 100644 (file)
--- a/mcs/class/corlib/System.IO/Directory.cs
+++ b/mcs/class/corlib/System.IO/Directory.cs
@@ -503,10 +503,11 @@ namespace System.IO
                                throw new ArgumentException ("Path is invalid", "path");
                        }
 
-                       string [] result = MonoIO.GetFileSystemEntries (wildpath, pattern, (int) attrs, (int) mask, out error);
+                       string path_with_pattern = Path.Combine (wildpath, pattern);
+                       string [] result = MonoIO.GetFileSystemEntries (path, path_with_pattern, (int) attrs, (int) mask, out error);
                        if (error != 0)
                                throw MonoIO.GetException (wildpath, error);
-
+                       
                        return result;
                }
 

diff --git a/mcs/class/corlib/System.IO/MonoIO.cs b/mcs/class/corlib/System.IO/MonoIO.cs
index 7385f3446c7615b9559a376154e9608eb1ebdae2..b69cfbe8b7302c62453cab3bd46fd2b73b40f5ab 100644 (file)
--- a/mcs/class/corlib/System.IO/MonoIO.cs
+++ b/mcs/class/corlib/System.IO/MonoIO.cs
@@ -137,7 +137,7 @@ namespace System.IO
                public extern static bool RemoveDirectory (string path, out MonoIOError error);
 
                [MethodImplAttribute (MethodImplOptions.InternalCall)]
-               public extern static string [] GetFileSystemEntries (string path, string pattern, int attrs, int mask, out MonoIOError error);
+               public extern static string [] GetFileSystemEntries (string path, string path_with_pattern, int attrs, int mask, out MonoIOError error);
 
                [MethodImplAttribute (MethodImplOptions.InternalCall)]
                public extern static string GetCurrentDirectory (out MonoIOError error);

diff --git a/mcs/class/corlib/System/ChangeLog b/mcs/class/corlib/System/ChangeLog
index 1cfc81771caeb48f7834c4a94431a1919ce14c8e..2948599859d2297e7b9161bbbe236dd00da64bb0 100644 (file)
--- a/mcs/class/corlib/System/ChangeLog
+++ b/mcs/class/corlib/System/ChangeLog
@@ -1,3 +1,7 @@
+2007-04-05  Dick Porter  <dick@ximian.com>
+
+       * Environment.cs: Increment mono_corlib_version
+
 2007-04-03  Alp Toker  <alp@atoker.com>
 
        * Array.cs: CreateInstance(Type,int[]) is params.

diff --git a/mcs/class/corlib/System/Environment.cs b/mcs/class/corlib/System/Environment.cs
index 18cdd947fdafd8eaf487d5c4375951f9ecdefe9a..e04be3b65e41133f6ccc83e79c134d8b2e1b8d18 100644 (file)
--- a/mcs/class/corlib/System/Environment.cs
+++ b/mcs/class/corlib/System/Environment.cs
@@ -59,7 +59,7 @@ namespace System {
                 * Changes which are already detected at runtime, like the addition
                 * of icalls, do not require an increment.
                 */
-               private const int mono_corlib_version = 55;
+               private const int mono_corlib_version = 56;
                
                public enum SpecialFolder
                {       // TODO: Determine if these windoze style folder identifiers