projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pass cancellation token to CopyAsync read block
[mono.git]
/
mcs
/
class
/
corlib
/
System.IO
/
FileSystemInfo.cs
diff --git
a/mcs/class/corlib/System.IO/FileSystemInfo.cs
b/mcs/class/corlib/System.IO/FileSystemInfo.cs
index 5c1e1a1ba26b6b029b764598dc3fe66bf7f2ab5e..9c2c3fae9f05eb3f21e12028c6c38e6d343370f9 100644
(file)
--- a/
mcs/class/corlib/System.IO/FileSystemInfo.cs
+++ b/
mcs/class/corlib/System.IO/FileSystemInfo.cs
@@
-3,6
+3,7
@@
// System.IO.FileSystemInfo.cs
//
// Copyright (C) 2001 Moonlight Enterprises, All Rights Reserved
// System.IO.FileSystemInfo.cs
//
// Copyright (C) 2001 Moonlight Enterprises, All Rights Reserved
+// Copyright 2011 Xamarin Inc (http://www.xamarin.com).
//
// Author: Jim Richardson, develop@wtfo-guru.com
// Dan Lewis (dihlewis@yahoo.co.uk)
//
// Author: Jim Richardson, develop@wtfo-guru.com
// Dan Lewis (dihlewis@yahoo.co.uk)
@@
-11,7
+12,7
@@
//------------------------------------------------------------------------------
//
//------------------------------------------------------------------------------
//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2004
-2005
Novell, Inc (http://www.novell.com)
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
@@
-33,14
+34,21
@@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
using System.Runtime.InteropServices;
using System.Runtime.Serialization;
using System.Runtime.InteropServices;
using System.Runtime.Serialization;
+using System.Security;
+using System.Security.Permissions;
namespace System.IO {
[Serializable]
namespace System.IO {
[Serializable]
+ [FileIOPermission (SecurityAction.InheritanceDemand, Unrestricted = true)]
+ [ComVisible (true)]
+#if NET_2_1
+ public abstract class FileSystemInfo {
+#else
public abstract class FileSystemInfo : MarshalByRefObject, ISerializable {
public abstract class FileSystemInfo : MarshalByRefObject, ISerializable {
+
#region Implementation of ISerializable
[ComVisible(false)]
#region Implementation of ISerializable
[ComVisible(false)]
@@
-51,7
+59,7
@@
namespace System.IO {
}
#endregion Implementation of ISerializable
}
#endregion Implementation of ISerializable
-
+#endif
// public properties
public abstract bool Exists { get; }
// public properties
public abstract bool Exists { get; }
@@
-95,6
+103,8
@@
namespace System.IO {
}
set {
}
set {
+ SecurityManager.EnsureElevatedPermissions (); // this is a no-op outside moonlight
+
long filetime = value.ToFileTime ();
MonoIOError error;
long filetime = value.ToFileTime ();
MonoIOError error;
@@
-125,6
+135,8
@@
namespace System.IO {
}
set {
}
set {
+ SecurityManager.EnsureElevatedPermissions (); // this is a no-op outside moonlight
+
long filetime = value.ToFileTime ();
MonoIOError error;
long filetime = value.ToFileTime ();
MonoIOError error;
@@
-157,6
+169,8
@@
namespace System.IO {
}
set {
}
set {
+ SecurityManager.EnsureElevatedPermissions (); // this is a no-op outside moonlight
+
long filetime = value.ToFileTime ();
MonoIOError error;
long filetime = value.ToFileTime ();
MonoIOError error;
@@
-238,9
+252,16
@@
namespace System.IO {
internal void CheckPath (string path)
{
if (path == null)
internal void CheckPath (string path)
{
if (path == null)
- throw new ArgumentNullException ();
+ throw new ArgumentNullException ("path");
+ if (path.Length == 0)
+ throw new ArgumentException ("An empty file name is not valid.");
if (path.IndexOfAny (Path.InvalidPathChars) != -1)
if (path.IndexOfAny (Path.InvalidPathChars) != -1)
- throw new ArgumentException ("Invalid characters in path.");
+ throw new ArgumentException ("Illegal characters in path.");
+ if (Environment.IsRunningOnWindows) {
+ int idx = path.IndexOf (':');
+ if (idx >= 0 && idx != 1)
+ throw new ArgumentException ("path");
+ }
}
internal MonoIOStat stat;
}
internal MonoIOStat stat;