From: Robert Jordan <robertj@gmx.net>
Date: Sat, 26 Jan 2008 14:02:42 +0000 (-0000)
Subject: 2008-01-26  Robert Jordan  <robertj@gmx.net>
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=1001273027fa7e91109b1655b321e80647600248;p=mono.git

2008-01-26  Robert Jordan  <robertj@gmx.net>

	* file-io.c: Implement and use wrappers for GetFileAttribute|Ex ()
	which resort to FindFirstFile when a certain error condition
	(ERROR_SHARING_VIOLATION) occured. Fixes bug #325212.
	Code is contributed under MIT/X11 license.


svn path=/trunk/mono/; revision=93987
---

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index 78fc05f80d1..bff74d89457 100644
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,10 @@
+2008-01-26  Robert Jordan  <robertj@gmx.net>
+
+	* file-io.c: Implement and use wrappers for GetFileAttribute|Ex ()
+	which resort to FindFirstFile when a certain error condition
+	(ERROR_SHARING_VIOLATION) occured. Fixes bug #325212.
+	Code is contributed under MIT/X11 license.
+
 2008-01-24  Jonathan Chambers  <joncham@gmail.com>
 
 	* marshal.c (emit_marshal_string): Fix out string marshalling
diff --git a/mono/metadata/file-io.c b/mono/metadata/file-io.c
index f8b01be0f76..409779c8dbb 100644
--- a/mono/metadata/file-io.c
+++ b/mono/metadata/file-io.c
@@ -207,6 +207,73 @@ static guint32 convert_attrs(MonoFileAttributes attrs)
 	return(attrs);
 }
 
+/*
+ * On Win32, GetFileAttributes|Ex () seems to try opening the file,
+ * which might lead to sharing violation errors, whereas FindFirstFile
+ * always succeeds. These 2 wrappers resort to FindFirstFile if
+ * GetFileAttributes|Ex () has failed.
+ */
+static guint32
+get_file_attributes (const gunichar2 *path)
+{
+	guint32 res;
+	WIN32_FIND_DATA find_data;
+	HANDLE find_handle;
+	gint32 error;
+
+	res = GetFileAttributes (path);
+	if (res != -1)
+		return res;
+
+	error = GetLastError ();
+
+	if (error != ERROR_SHARING_VIOLATION)
+		return res;
+
+	find_handle = FindFirstFile (path, &find_data);
+
+	if (find_handle == INVALID_HANDLE_VALUE)
+		return res;
+
+	FindClose (find_handle);
+
+	return find_data.dwFileAttributes;
+}
+
+static gboolean
+get_file_attributes_ex (const gunichar2 *path, WIN32_FILE_ATTRIBUTE_DATA *data)
+{
+	gboolean res;
+	WIN32_FIND_DATA find_data;
+	HANDLE find_handle;
+	gint32 error;
+
+	res = GetFileAttributesEx (path, GetFileExInfoStandard, data);
+	if (res)
+		return TRUE;
+
+	error = GetLastError ();
+
+	if (error != ERROR_SHARING_VIOLATION)
+		return FALSE;
+
+	find_handle = FindFirstFile (path, &find_data);
+
+	if (find_handle == INVALID_HANDLE_VALUE)
+		return FALSE;
+
+	FindClose (find_handle);
+
+	data->dwFileAttributes = find_data.dwFileAttributes;
+	data->ftCreationTime = find_data.ftCreationTime;
+	data->ftLastAccessTime = find_data.ftLastAccessTime;
+	data->ftLastWriteTime = find_data.ftLastWriteTime;
+	data->nFileSizeHigh = find_data.nFileSizeHigh;
+	data->nFileSizeLow = find_data.nFileSizeLow;
+	
+	return TRUE;
+}
+
 /* System.IO.MonoIO internal calls */
 
 MonoBoolean
@@ -462,7 +529,7 @@ ves_icall_System_IO_MonoIO_GetFileAttributes (MonoString *path, gint32 *error)
 
 	*error=ERROR_SUCCESS;
 	
-	ret=GetFileAttributes (mono_string_chars (path));
+	ret=get_file_attributes (mono_string_chars (path));
 
 	/* 
 	 * The definition of INVALID_FILE_ATTRIBUTES in the cygwin win32
@@ -528,7 +595,7 @@ ves_icall_System_IO_MonoIO_GetFileStat (MonoString *path, MonoIOStat *stat,
 
 	*error=ERROR_SUCCESS;
 	
-	result = GetFileAttributesEx (mono_string_chars (path), GetFileExInfoStandard, &data);
+	result = get_file_attributes_ex (mono_string_chars (path), &data);
 
 	if (result) {
 		convert_win32_file_attribute_data (&data,
@@ -580,7 +647,7 @@ ves_icall_System_IO_MonoIO_Open (MonoString *filename, gint32 mode,
 
 	/* If we're opening a directory we need to set the extra flag
 	 */
-	attrs = GetFileAttributes (chars);
+	attrs = get_file_attributes (chars);
 	if (attrs != INVALID_FILE_ATTRIBUTES) {
 		if (attrs & FILE_ATTRIBUTE_DIRECTORY) {
 			attributes |= FILE_FLAG_BACKUP_SEMANTICS;