utility: improved box integration, removed need for build-time macro.

3 files changed, 95 insertions, 91 deletions

diff --git a/project/common.mk b/project/common.mk
index a768e42..8ee6811 100644
--- a/project/common.mk
+++ b/project/common.mk
@@ -1,6 +1,7 @@
 COMMON_SRCS = \
 	src/crc/mdso_crc64.c \
 	src/crc/mdso_crc32.c \
+	src/driver/mdso_amain.c \
 	src/driver/mdso_driver_ctx.c \
 	src/driver/mdso_unit_ctx.c \
 	src/logic/mdso_create_implib_sources.c \
diff --git a/src/driver/mdso_amain.c b/src/driver/mdso_amain.c
new file mode 100644
index 0000000..a00e2d1
--- /dev/null
+++ b/src/driver/mdso_amain.c
@@ -0,0 +1,94 @@
+/****************************************************************/
+/*  mdso: midipix dso scavenger                                 */
+/*  Copyright (C) 2015--2016  Z. Gilboa                         */
+/*  Released under GPLv2 and GPLv3; see COPYING.MDSO.           */
+/****************************************************************/
+
+#include <stdio.h>
+#include <unistd.h>
+#include <mdso/mdso.h>
+#include <mdso/mdso_output.h>
+#include "mdso_driver_impl.h"
+
+#ifndef MDSO_DRIVER_FLAGS
+#define MDSO_DRIVER_FLAGS	MDSO_DRIVER_VERBOSITY_ERRORS \
+				| MDSO_DRIVER_VERBOSITY_USAGE
+#endif
+
+static const char vermsg[] = "%s%s%s (git://midipix.org/mdso): "
+			     "version %s%d.%d.%d%s.\n"
+			     "[commit reference: %s%s%s]\n";
+
+static const char * const mdso_ver_color[6] = {
+		"\x1b[1m\x1b[35m","\x1b[0m",
+		"\x1b[1m\x1b[32m","\x1b[0m",
+		"\x1b[1m\x1b[34m","\x1b[0m"
+};
+
+static const char * const mdso_ver_plain[6] = {
+		"","",
+		"","",
+		"",""
+};
+
+static ssize_t mdso_version(struct mdso_driver_ctx * dctx)
+{
+	const struct mdso_source_version * verinfo;
+	const char * const * verclr;
+
+	verinfo = mdso_source_version();
+	verclr  = isatty(STDOUT_FILENO) ? mdso_ver_color : mdso_ver_plain;
+
+	return fprintf(stdout,vermsg,
+			verclr[0],dctx->program,verclr[1],
+			verclr[2],verinfo->major,verinfo->minor,
+			verinfo->revision,verclr[3],
+			verclr[4],verinfo->commit,verclr[5]);
+}
+
+static void mdso_perform_unit_actions(struct mdso_unit_ctx * uctx)
+{
+        uint64_t flags = uctx->cctx->fmtflags;
+
+        if (flags & MDSO_OUTPUT_EXPORT_SYMS) {
+                uctx->status = mdso_output_export_symbols(uctx,uctx->cctx,stdout);
+                uctx->nerrors += !!uctx->status;
+        }
+}
+
+static int mdso_exit(struct mdso_driver_ctx * dctx, int nerrors)
+{
+	mdso_free_driver_ctx(dctx);
+	return nerrors ? 2 : 0;
+}
+
+int mdso_main(int argc, char ** argv, char ** envp)
+{
+	int				ret;
+	struct mdso_driver_ctx *	dctx;
+	struct mdso_unit_ctx *		uctx;
+	const char **			unit;
+
+	if ((ret = mdso_get_driver_ctx(argv,envp,MDSO_DRIVER_FLAGS,&dctx)))
+		return (ret == MDSO_USAGE) ? !--argc : 2;
+
+	if (dctx->cctx->drvflags & MDSO_DRIVER_VERSION)
+		if ((mdso_version(dctx)) < 0)
+			return mdso_exit(dctx,2);
+
+	for (unit=dctx->units; *unit; unit++) {
+		if (!(mdso_get_unit_ctx(dctx,*unit,&uctx))) {
+			mdso_perform_unit_actions(uctx);
+			ret += uctx->nerrors;
+			mdso_free_unit_ctx(uctx);
+		}
+	}
+
+	if (*dctx->units) {
+		dctx->status  =  mdso_create_implib_sources(dctx);
+		dctx->nerrors += !!dctx->status;
+		ret += dctx->nerrors;
+	}
+
+	return mdso_exit(dctx,ret);
+}
diff --git a/src/mdso.c b/src/mdso.c
index a036517..9bc09de 100644
--- a/src/mdso.c
+++ b/src/mdso.c
@@ -4,100 +4,9 @@
 /*  Released under GPLv2 and GPLv3; see COPYING.MDSO.           */
 /****************************************************************/
 
-#include <stdio.h>
-#include <unistd.h>
 #include <mdso/mdso.h>
-#include <mdso/mdso_output.h>
-#include "mdso_driver_impl.h"
-
-#ifndef MDSO_DRIVER_FLAGS
-#define MDSO_DRIVER_FLAGS	MDSO_DRIVER_VERBOSITY_ERRORS \
-				| MDSO_DRIVER_VERBOSITY_USAGE
-#endif
-
-static const char vermsg[] = "%s%s%s (git://midipix.org/mdso): "
-			     "version %s%d.%d.%d%s.\n"
-			     "[commit reference: %s%s%s]\n";
-
-static const char * const mdso_ver_color[6] = {
-		"\x1b[1m\x1b[35m","\x1b[0m",
-		"\x1b[1m\x1b[32m","\x1b[0m",
-		"\x1b[1m\x1b[34m","\x1b[0m"
-};
-
-static const char * const mdso_ver_plain[6] = {
-		"","",
-		"","",
-		"",""
-};
-
-static ssize_t mdso_version(struct mdso_driver_ctx * dctx)
-{
-	const struct mdso_source_version * verinfo;
-	const char * const * verclr;
-
-	verinfo = mdso_source_version();
-	verclr  = isatty(STDOUT_FILENO) ? mdso_ver_color : mdso_ver_plain;
-
-	return fprintf(stdout,vermsg,
-			verclr[0],dctx->program,verclr[1],
-			verclr[2],verinfo->major,verinfo->minor,
-			verinfo->revision,verclr[3],
-			verclr[4],verinfo->commit,verclr[5]);
-}
-
-static void mdso_perform_unit_actions(struct mdso_unit_ctx * uctx)
-{
-        uint64_t flags = uctx->cctx->fmtflags;
-
-        if (flags & MDSO_OUTPUT_EXPORT_SYMS) {
-                uctx->status = mdso_output_export_symbols(uctx,uctx->cctx,stdout);
-                uctx->nerrors += !!uctx->status;
-        }
-}
-
-static int mdso_exit(struct mdso_driver_ctx * dctx, int nerrors)
-{
-	mdso_free_driver_ctx(dctx);
-	return nerrors ? 2 : 0;
-}
-
-int mdso_main(int argc, char ** argv, char ** envp)
-{
-	int				ret;
-	struct mdso_driver_ctx *	dctx;
-	struct mdso_unit_ctx *		uctx;
-	const char **			unit;
-
-	if ((ret = mdso_get_driver_ctx(argv,envp,MDSO_DRIVER_FLAGS,&dctx)))
-		return (ret == MDSO_USAGE) ? !--argc : 2;
-
-	if (dctx->cctx->drvflags & MDSO_DRIVER_VERSION)
-		if ((mdso_version(dctx)) < 0)
-			return mdso_exit(dctx,2);
-
-	for (unit=dctx->units; *unit; unit++) {
-		if (!(mdso_get_unit_ctx(dctx,*unit,&uctx))) {
-			mdso_perform_unit_actions(uctx);
-			ret += uctx->nerrors;
-			mdso_free_unit_ctx(uctx);
-		}
-	}
-
-	if (*dctx->units) {
-		dctx->status  =  mdso_create_implib_sources(dctx);
-		dctx->nerrors += !!dctx->status;
-		ret += dctx->nerrors;
-	}
-
-	return mdso_exit(dctx,ret);
-}
-
-#ifndef MDSO_IN_A_BOX
 
 int main(int argc, char ** argv, char ** envp)
 {
 	return mdso_main(argc,argv,envp);
 }
-
-#endif