2006-07-16 Marek Safar <marek.safar@seznam.cz>

	A fix for #70506
	* driver.cs (MainDriver): When a file extension is missing,
	use a default one.

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

diff --git a/mcs/gmcs/ChangeLog b/mcs/gmcs/ChangeLog
index a2994afadc36c9e0a98eaf9d78bab3ad8ff0b387..eaa66b8a08aeb540cfb0cd6f7aebbebee11987b8 100644 (file)
--- a/mcs/gmcs/ChangeLog
+++ b/mcs/gmcs/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-16  Marek Safar  <marek.safar@seznam.cz>
+
+       A fix for #70506
+       * driver.cs (MainDriver): When a file extension is missing,
+       use a default one.
+
 2006-07-15  Marek Safar  <marek.safar@seznam.cz>
 
        * annonymous.cs (AnonymousMethod.CreateScopeType): Fixed nested type

diff --git a/mcs/gmcs/driver.cs b/mcs/gmcs/driver.cs
index 916992e7ee9158fd62aacf56ecab0a4a804d729a..4c2f0387f8c78bf4c4439815859d4e9ee146b526 100644 (file)
--- a/mcs/gmcs/driver.cs
+++ b/mcs/gmcs/driver.cs
@@ -1609,10 +1609,13 @@ namespace Mono.CSharp
                                int pos = first_source.LastIndexOf ('.');
 
                                if (pos > 0)
-                                       output_file = first_source.Substring (0, pos) + RootContext.TargetExt;
+                                       output_file = first_source.Substring (0, pos);
                                else
-                                       output_file = first_source + RootContext.TargetExt;
+                                       output_file = first_source;
                        }
+                       
+                       if (!Path.HasExtension (output_file))
+                               output_file += RootContext.TargetExt;
 
                        if (!CodeGen.Init (output_file, output_file, want_debugging_support))
                                return false;

diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog
index 87070c85b5b1f777fd95a183b38222035a3496c0..5b93e2a5ff5e97a0b5b1403121089dab3c07031f 100644 (file)
--- a/mcs/mcs/ChangeLog
+++ b/mcs/mcs/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-16  Marek Safar  <marek.safar@seznam.cz>
+
+       A fix for #70506
+       * driver.cs (MainDriver): When a file extension is missing,
+       use a default one.
+
 2006-07-15  Marek Safar  <marek.safar@seznam.cz>
 
        * annonymous.cs (AnonymousMethod.CreateScopeType): Fixed nested type

diff --git a/mcs/mcs/driver.cs b/mcs/mcs/driver.cs
index 08fc9dd07939ed1441dcf2384f97f73410d3ef79..2e1e1212937d270477d81ad2bc7ef7c99f4df0bb 100644 (file)
--- a/mcs/mcs/driver.cs
+++ b/mcs/mcs/driver.cs
@@ -1605,10 +1605,13 @@ namespace Mono.CSharp
                                int pos = first_source.LastIndexOf ('.');
 
                                if (pos > 0)
-                                       output_file = first_source.Substring (0, pos) + RootContext.TargetExt;
+                                       output_file = first_source.Substring (0, pos);
                                else
-                                       output_file = first_source + RootContext.TargetExt;
+                                       output_file = first_source;
                        }
+                       
+                       if (!Path.HasExtension (output_file))
+                               output_file += RootContext.TargetExt;
 
                        if (!CodeGen.Init (output_file, output_file, want_debugging_support))
                                return false;

diff --git a/mcs/tests/test-525.cs b/mcs/tests/test-525.cs
new file mode 100644 (file)
index 0000000..d0dfadc
--- /dev/null
+++ b/mcs/tests/test-525.cs
@@ -0,0 +1,8 @@
+// Compiler options: -out:test-525\r
+\r
+public class C\r
+{\r
+       public static void Main ()\r
+       {\r
+       }\r
+}
\ No newline at end of file