mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 5.8.0.22

Browse Source 
Former-commit-id: df344e34b07851d296efb3e6604c8db42b6f7aa3
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-10-19 20:04:20 +00:00
parent 5f4a27cc8a
commit 7d05485754
5020 changed files with 114082 additions and 186061 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
mcs/class/corlib/System.IO/DirectoryInfo.cs
View File

@ -41,6 +41,8 @@ using System.Security;
using System.Text;
using System.Security.AccessControl;
using Microsoft.Win32.SafeHandles;
namespace System.IO {
[Serializable]
@ -424,39 +426,57 @@ namespace System.IO {
return EnumerateFileSystemInfos (FullPath, searchPattern, searchOption);
}
static internal IEnumerable<FileSystemInfo> EnumerateFileSystemInfos (string full, string searchPattern, SearchOption searchOption)
static internal IEnumerable<FileSystemInfo> EnumerateFileSystemInfos (string basePath, string searchPattern, SearchOption searchOption)
{
string path_with_pattern = Path.Combine (full, searchPattern);
IntPtr handle = IntPtr.Zero;
MonoIOError error;
FileAttributes rattr;
bool subdirs = searchOption == SearchOption.AllDirectories;
Path.Validate (basePath);
SafeFindHandle findHandle = null;
Path.Validate (full);
try {
string s = MonoIO.FindFirst (full, path_with_pattern, out rattr, out error, out handle);
if (s == null)
string filePath;
int nativeAttrs;
string basePathWithPattern = Path.Combine (basePath, searchPattern);
int nativeError;
try {} finally {
findHandle = new SafeFindHandle (MonoIO.FindFirstFile (basePathWithPattern, out filePath, out nativeAttrs, out nativeError));
}
if (findHandle.IsInvalid) {
MonoIOError error = (MonoIOError) nativeError;
if (error != MonoIOError.ERROR_FILE_NOT_FOUND)
throw MonoIO.GetException (Path.GetDirectoryName (basePathWithPattern), error);
yield break;
if (error != 0)
throw MonoIO.GetException (Path.GetDirectoryName (path_with_pattern), (MonoIOError) error);
}
do {
if (((rattr & FileAttributes.ReparsePoint) == 0)){
if ((rattr & FileAttributes.Directory) != 0)
yield return new DirectoryInfo (s);
if (filePath == null)
yield break;
if (filePath == "." || filePath == "..")
continue;
FileAttributes attrs = (FileAttributes) nativeAttrs;
string fullPath = Path.Combine (basePath, filePath);
if ((attrs & FileAttributes.ReparsePoint) == 0) {
if ((attrs & FileAttributes.Directory) != 0)
yield return new DirectoryInfo (fullPath);
else
yield return new FileInfo (s);
yield return new FileInfo (fullPath);
}
if (((rattr & FileAttributes.Directory) != 0) && subdirs)
foreach (FileSystemInfo child in EnumerateFileSystemInfos (s, searchPattern, searchOption))
if ((attrs & FileAttributes.Directory) != 0 && searchOption == SearchOption.AllDirectories) {
foreach (FileSystemInfo child in EnumerateFileSystemInfos (fullPath, searchPattern, searchOption))
yield return child;
} while ((s = MonoIO.FindNext (handle, out rattr, out error)) != null);
}
} while (MonoIO.FindNextFile (findHandle.DangerousGetHandle (), out filePath, out nativeAttrs, out int _));
} finally {
if (handle != IntPtr.Zero)
MonoIO.FindClose (handle);
if (findHandle != null)
findHandle.Dispose ();
}
}

11
mcs/class/corlib/System.IO/MonoIO.cs
View File

@ -174,9 +174,6 @@ namespace System.IO
[MethodImplAttribute (MethodImplOptions.InternalCall)]
public extern static bool RemoveDirectory (string path, out MonoIOError error);
[MethodImplAttribute (MethodImplOptions.InternalCall)]
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);
@ -229,14 +226,6 @@ namespace System.IO
//
// Find file methods
//
[MethodImplAttribute (MethodImplOptions.InternalCall)]
public extern static string FindFirst (string path, string pattern, out FileAttributes result_attr, out MonoIOError error, out IntPtr handle);
[MethodImplAttribute (MethodImplOptions.InternalCall)]
public extern static string FindNext (IntPtr handle, out FileAttributes result_attr, out MonoIOError error);
[MethodImplAttribute (MethodImplOptions.InternalCall)]
public extern static int FindClose (IntPtr handle);
[MethodImplAttribute (MethodImplOptions.InternalCall)]
public extern static IntPtr FindFirstFile (string path_with_pattern, out string fileName, out int fileAttr, out int error);