diff options
| author | Gonzalo Paniagua Javier <gonzalo.mono@gmail.com> | 2003-07-20 14:01:15 +0400 |
|---|---|---|
| committer | Gonzalo Paniagua Javier <gonzalo.mono@gmail.com> | 2003-07-20 14:01:15 +0400 |
| commit | 4a30de43e94969bbd112f45f5d93329b7fb19db7 (patch) | |
| tree | 7d06d6dbbfa5b5c6466a8f1b1cd60f1099a2931f | |
| parent | 3b9113adc28719823d1f77754aa721aa89b3527c (diff) | |
2003-07-20 Gonzalo Paniagua Javier <gonzalo@ximian.com>
* AppDomainSetup.cs: fixed bug #46609.
svn path=/trunk/mcs/; revision=16440
| -rwxr-xr-x | mcs/class/corlib/System/AppDomainSetup.cs | 12 | ||||
| -rw-r--r-- | mcs/class/corlib/System/ChangeLog | 4 |
2 files changed, 14 insertions, 2 deletions
diff --git a/mcs/class/corlib/System/AppDomainSetup.cs b/mcs/class/corlib/System/AppDomainSetup.cs index 005201d0b81..8910f465d4d 100755 --- a/mcs/class/corlib/System/AppDomainSetup.cs +++ b/mcs/class/corlib/System/AppDomainSetup.cs @@ -44,10 +44,18 @@ namespace System { static string GetAppBase (string appBase) { int len = appBase.Length; - if (len >= 8 && appBase.ToLower ().StartsWith ("file://")) + if (len >= 8 && appBase.ToLower ().StartsWith ("file://")) { appBase = appBase.Substring (7); - else if (appBase.IndexOf (':') == -1) + if (Path.DirectorySeparatorChar != '/') + appBase = appBase.Replace ('/', Path.DirectorySeparatorChar); + + } else if (appBase.IndexOf (':') == -1) { appBase = Path.GetFullPath (appBase); + } + + len = appBase.Length; + if (len == 0 || appBase [len - 1] != Path.DirectorySeparatorChar) + appBase = appBase + Path.DirectorySeparatorChar; return appBase; } diff --git a/mcs/class/corlib/System/ChangeLog b/mcs/class/corlib/System/ChangeLog index bac9b1b4932..a8f6eaac13c 100644 --- a/mcs/class/corlib/System/ChangeLog +++ b/mcs/class/corlib/System/ChangeLog @@ -1,4 +1,8 @@ +2003-07-20 Gonzalo Paniagua Javier <gonzalo@ximian.com> + + * AppDomainSetup.cs: fixed bug #46609. + Thu Jul 17 17:28:27 CEST 2003 Paolo Molaro <lupus@ximian.com> * MonoType.cs: use an icall for IsPrimitiveImpl (). |