From ecb7ed0e80be1af30df8c43ac78ee212fb4c1734 Mon Sep 17 00:00:00 2001
From: Tor Andersson <tor.andersson@artifex.com>
Date: Mon, 25 May 2015 13:22:59 +0200
Subject: Merge 'mudraw' into 'mutool' binary.

Use "mutool draw" or symlink mutool to mudraw to use mudraw.
---
 source/tools/mudraw.c | 13 +------------
 source/tools/mutool.c |  6 ++++++
 2 files changed, 7 insertions(+), 12 deletions(-)

(limited to 'source')

diff --git a/source/tools/mudraw.c b/source/tools/mudraw.c
index 882ce660..4483ad43 100644
--- a/source/tools/mudraw.c
+++ b/source/tools/mudraw.c
@@ -7,7 +7,6 @@
 
 #ifdef _MSC_VER
 #include <winsock2.h>
-#define main main_utf8
 #else
 #include <sys/time.h>
 #endif
@@ -847,7 +846,7 @@ trace_realloc(void *arg, void *p_, unsigned int size)
 	return &p[1];
 }
 
-int main(int argc, char **argv)
+int mudraw_main(int argc, char **argv)
 {
 	char *password = "";
 	fz_document *doc = NULL;
@@ -1174,13 +1173,3 @@ int main(int argc, char **argv)
 
 	return (errored != 0);
 }
-
-#ifdef _MSC_VER
-int wmain(int argc, wchar_t *wargv[])
-{
-	char **argv = fz_argv_from_wargv(argc, wargv);
-	int ret = main(argc, argv);
-	fz_free_argv(argc, argv);
-	return ret;
-}
-#endif
diff --git a/source/tools/mutool.c b/source/tools/mutool.c
index 1389b37b..6b61dab4 100644
--- a/source/tools/mutool.c
+++ b/source/tools/mutool.c
@@ -8,6 +8,7 @@
 #define main main_utf8
 #endif
 
+int mudraw_main(int argc, char *argv[]);
 int pdfclean_main(int argc, char *argv[]);
 int pdfextract_main(int argc, char *argv[]);
 int pdfinfo_main(int argc, char *argv[]);
@@ -20,6 +21,7 @@ static struct {
 	char *name;
 	char *desc;
 } tools[] = {
+	{ mudraw_main, "draw", "convert document" },
 	{ pdfclean_main, "clean", "rewrite pdf file" },
 	{ pdfextract_main, "extract", "extract font and image resources" },
 	{ pdfinfo_main, "info", "show information about pdf resources" },
@@ -62,6 +64,10 @@ int main(int argc, char **argv)
 			strcat(buf, tools[i].name);
 			if (namematch(end, start, buf) || namematch(end, start, buf+2))
 				return tools[i].func(argc, argv);
+			strcpy(buf, "mu");
+			strcat(buf, tools[i].name);
+			if (namematch(end, start, buf))
+				return tools[i].func(argc, argv);
 		}
 	}
 
-- 
cgit v1.2.3