From: dlahoti <deven.lahoti@gmail.com>
Date: Thu, 23 Jun 2016 04:24:25 +0000 (-0500)
Subject: make monodis exit with value 1 on an error
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=d7962daf42babaee5d7490a03f08b37380b8a7c6;p=mono.git

make monodis exit with value 1 on an error

This should make it easier to programmatically check for errors, since it will remove the need to test the output string, which is an unreliable way of doing things.
---

diff --git a/mono/dis/main.c b/mono/dis/main.c
index d1b85c5509a..1af061c383a 100644
--- a/mono/dis/main.c
+++ b/mono/dis/main.c
@@ -1617,7 +1617,7 @@ struct {
  *
  * Disassembles the @file file.
  */
-static void
+static int
 disassemble_file (const char *file)
 {
 	MonoImageOpenStatus status;
@@ -1626,7 +1626,7 @@ disassemble_file (const char *file)
 	img = mono_image_open (file, &status);
 	if (!img) {
 		fprintf (stderr, "Error while trying to process %s\n", file);
-		return;
+		return 1;
 	} else {
 		/* FIXME: is this call necessary? */
 		mono_assembly_load_from_full (img, file, &status, FALSE);
@@ -1659,6 +1659,7 @@ disassemble_file (const char *file)
 	}
 	
 	mono_image_close (img);
+	return 0;
 }
 
 typedef struct {
@@ -2028,12 +2029,14 @@ main (int argc, char *argv [])
 
 		mono_install_assembly_preload_hook (monodis_preload, GUINT_TO_POINTER (FALSE));
 
-		disassemble_file (filename);
+		return disassemble_file (filename);
 	} else {
 		mono_init (argv [0]);
 
+		i = 0;
 		for (l = input_files; l; l = l->next)
-			disassemble_file ((const char *)l->data);
+			if (disassemble_file ((const char *)l->data) == 1) i = 1;
+		return i;
 	}
 
 	return 0;