1 files changed, 35 insertions, 67 deletions

diff --git a/src/driver/pe_amain.c b/src/driver/pe_amain.c
index 286e111..a766dba 100644
--- a/src/driver/pe_amain.c
+++ b/src/driver/pe_amain.c
@@ -10,13 +10,15 @@
 #include <perk/perk_output.h>
 #include "perk_driver_impl.h"
 #include "perk_dprintf_impl.h"
+#include "perk_ar_impl.h"
 
 #ifndef PERK_DRIVER_FLAGS
 #define PERK_DRIVER_FLAGS	PERK_DRIVER_VERBOSITY_ERRORS \
-				| PERK_DRIVER_VERBOSITY_USAGE
+				| PERK_DRIVER_VERBOSITY_UTILITY \
+				| PERK_DRIVER_AR_OBJECT_VECTOR
 #endif
 
-static const char vermsg[] = "%s%s%s (git://midipix.org/perk): "
+static const char vermsg[] = "%s%s%s (https://git.foss21.org/perk): "
 			     "version %s%d.%d.%d%s.\n"
 			     "[commit reference: %s%s%s]\n";
 
@@ -48,67 +50,10 @@ static ssize_t pe_version(struct pe_driver_ctx * dctx, int fdout)
 			verclr[4],verinfo->commit,verclr[5]);
 }
 
-static void pe_perform_hdrdump_actions(
-	const struct pe_driver_ctx *	dctx,
-	struct pe_unit_ctx *		uctx)
-{
-	if (dctx->cctx->hdrdump & PERK_HDRDUMP_IMAGE_DOS_HEADER)
-		pe_hdrdump_image_dos_hdr(dctx,uctx->meta);
-
-	if (dctx->cctx->hdrdump & PERK_HDRDUMP_COFF_IMAGE_HEADER)
-		pe_hdrdump_coff_image_hdr(dctx,uctx->meta);
-
-	if (dctx->cctx->hdrdump & PERK_HDRDUMP_COFF_OBJECT_HEADER)
-		pe_hdrdump_coff_object_hdr(dctx,uctx->meta);
-
-	if (dctx->cctx->hdrdump & PERK_HDRDUMP_COFF_OPT_HEADER)
-		pe_hdrdump_coff_opt_hdr(dctx,uctx->meta);
-
-	if (dctx->cctx->hdrdump & PERK_HDRDUMP_SECTION_TABLE)
-		pe_hdrdump_sec_tbl(dctx,uctx->meta);
-
-	if (dctx->cctx->hdrdump & PERK_HDRDUMP_EXPORT_HEADER)
-		pe_hdrdump_export_hdr(dctx,uctx->meta);
-
-	if (dctx->cctx->hdrdump & PERK_HDRDUMP_IMPORT_TABLE)
-		pe_hdrdump_import_tbl(dctx,uctx->meta);
-}
-
-static void pe_perform_unit_actions(
-	const struct pe_driver_ctx *	dctx,
-	struct pe_unit_ctx *		uctx)
-{
-	uint64_t flags = dctx->cctx->fmtflags;
-
-	if (flags & PERK_OUTPUT_IMAGE_CATEGORY)
-		pe_output_image_category(dctx,uctx->meta);
-
-	if (flags & PERK_OUTPUT_IMAGE_SECTIONS)
-		pe_output_image_sections(dctx,uctx->meta);
-
-	if (flags & PERK_OUTPUT_IMAGE_SYMBOLS)
-		pe_output_image_symbols(dctx,uctx->meta);
-
-	if (flags & PERK_OUTPUT_IMAGE_STRINGS)
-		pe_output_image_strings(dctx,uctx->meta);
-
-	if (flags & PERK_OUTPUT_EXPORT_SYMS)
-		pe_output_export_symbols(dctx,uctx->meta);
-
-	if ((flags & PERK_OUTPUT_IMPORT_LIBS) || (flags & PERK_OUTPUT_IMPORT_SYMS))
-		pe_output_import_libraries(dctx,uctx->meta);
-
-	if ((flags & PERK_OUTPUT_MDSO_LIBS) || (flags & PERK_OUTPUT_MDSO_SYMS))
-		pe_output_mdso_libraries(dctx,uctx->meta);
-
-	if (dctx->cctx->hdrdump)
-		pe_perform_hdrdump_actions(dctx,uctx);
-}
-
 static int pe_exit(struct pe_driver_ctx * dctx, int ret)
 {
 	pe_output_error_vector(dctx);
-	pe_free_driver_ctx(dctx);
+	pe_lib_free_driver_ctx(dctx);
 	return ret;
 }
 
@@ -118,13 +63,16 @@ int pe_main(char ** argv, char ** envp, const struct pe_fd_ctx * fdctx)
 	int			fdout;
 	uint64_t		flags;
 	struct pe_driver_ctx *	dctx;
-	struct pe_unit_ctx *	uctx;
 	const char **		unit;
+	const char *            posname;
+	const char *            arname;
+	const char **           arfiles;
+	uint64_t                arflags;
 
 	flags = PERK_DRIVER_FLAGS;
 	fdout = fdctx ? fdctx->fdout : STDOUT_FILENO;
 
-	if ((ret = pe_get_driver_ctx(argv,envp,flags,fdctx,&dctx)))
+	if ((ret = pe_lib_get_driver_ctx(argv,envp,flags,fdctx,&dctx)))
 		return (ret == PERK_USAGE)
 			? !argv || !argv[0] || !argv[1]
 			: PERK_ERROR;
@@ -133,11 +81,31 @@ int pe_main(char ** argv, char ** envp, const struct pe_fd_ctx * fdctx)
 		if ((pe_version(dctx,fdout)) < 0)
 			return pe_exit(dctx,PERK_ERROR);
 
-	for (unit=dctx->units; *unit; unit++) {
-		if (!(pe_get_unit_ctx(dctx,*unit,&uctx))) {
-			pe_perform_unit_actions(dctx,uctx);
-			pe_free_unit_ctx(uctx);
-		}
+	switch (dctx->cctx->cmd) {
+		case PERK_CMD_PERK:
+			for (unit=dctx->units; *unit; unit++)
+				pe_cmd_perk(dctx,*unit);
+			break;
+
+		case PERK_CMD_AR:
+			arflags = dctx->cctx->drvflags;
+
+			if (arflags & AR_POSNAME_MASK) {
+				posname = dctx->units[0];
+				arname  = posname ? dctx->units[1]  : 0;
+				arfiles = arname  ? &dctx->units[2] : 0;
+			} else {
+				posname = 0;
+				arname = dctx->units[0];
+				arfiles = arname  ? &dctx->units[1] : 0;
+			}
+
+			pe_cmd_ar(dctx,arflags,posname,arname,arfiles);
+
+			break;
+
+		default:
+			break;
 	}
 
 	return pe_exit(dctx,dctx->errv[0] ? PERK_ERROR : PERK_OK);