2004-09-21 Martin Baulig <martin@ximian.com>

	* main.c (main): If just a single assembly was specified, use the
	runtime version it requires.

svn path=/trunk/mono/; revision=34117

diff --git a/mono/dis/ChangeLog b/mono/dis/ChangeLog
index bc69090b4576e31b94118a0cf5f35f06ed944d1c..814612669ec755d9b48c8ad20d000b3a07b5dac8 100644 (file)
--- a/mono/dis/ChangeLog
+++ b/mono/dis/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-21  Martin Baulig  <martin@ximian.com>
+
+       * main.c (main): If just a single assembly was specified, use the
+       runtime version it requires.
+
 2004-09-16  Sebastien Pouliot  <sebastien@ximian.com>
 
        * dump.c: Added new security actions added in 2.0: LinkDemandChoice,

diff --git a/mono/dis/main.c b/mono/dis/main.c
index 7228614315154ecf3eddb7b5d60b293b432978be..c398d52db2f24cb6ad95c84cd2b47a119fa2f19c 100644 (file)
--- a/mono/dis/main.c
+++ b/mono/dis/main.c
@@ -1405,11 +1405,21 @@ main (int argc, char *argv [])
 
        if (input_files == NULL)
                usage ();
-       
-       mono_init (argv [0]);
 
-       for (l = input_files; l; l = l->next)
-               disassemble_file (l->data);
+       /*
+        * If we just have one file, use the corlib version it requires.
+        */
+       if (!input_files->next) {
+               char *filename = l->data;
+
+               mono_init_from_assembly (argv [0], filename);
+               disassemble_file (filename);
+       } else {
+               mono_init (argv [0]);
+
+               for (l = input_files; l; l = l->next)
+                       disassemble_file (l->data);
+       }
 
        return 0;
 }