summaryrefslogtreecommitdiffhomepage
path: root/src/driver
diff options
context:
space:
mode:
Diffstat (limited to 'src/driver')
-rw-r--r--src/driver/pe_amain.c27
-rw-r--r--src/driver/pe_driver_ctx.c114
-rw-r--r--src/driver/pe_unit_ctx.c141
3 files changed, 246 insertions, 36 deletions
diff --git a/src/driver/pe_amain.c b/src/driver/pe_amain.c
index 173f391..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_UTILITY
+ | 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";
@@ -62,6 +64,10 @@ int pe_main(char ** argv, char ** envp, const struct pe_fd_ctx * fdctx)
uint64_t flags;
struct pe_driver_ctx * dctx;
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;
@@ -81,6 +87,23 @@ int pe_main(char ** argv, char ** envp, const struct pe_fd_ctx * fdctx)
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;
}
diff --git a/src/driver/pe_driver_ctx.c b/src/driver/pe_driver_ctx.c
index afa46e7..11c2e27 100644
--- a/src/driver/pe_driver_ctx.c
+++ b/src/driver/pe_driver_ctx.c
@@ -14,6 +14,7 @@
#include <perk/perk_output.h>
#include "perk_version.h"
#include "perk_driver_impl.h"
+#include "perk_synopsis_impl.h"
#include "argv/argv.h"
/* package info */
@@ -27,12 +28,14 @@ static const struct pe_source_version pe_src_version = {
/* perk command names */
static const char * const perk_cmd_name[PERK_CMD_CAP] = {
[PERK_CMD_PERK] = "perk",
+ [PERK_CMD_AR] = "ar",
};
/* perk command options */
static const struct argv_option * perk_cmd_options[PERK_CMD_CAP] = {
[PERK_CMD_DEFAULT] = pe_default_options,
[PERK_CMD_PERK] = pe_perk_options,
+ [PERK_CMD_AR] = pe_ar_options,
};
/* default fd context */
@@ -74,30 +77,40 @@ static int pe_driver_usage(
const char * arg,
const struct argv_option ** optv,
struct argv_meta * meta,
+ const char * cmdarg,
enum pe_cmd cmd)
{
- char header[512];
- char * cmdarg[2];
- const char * cmdname;
-
- if (cmd == PERK_CMD_DEFAULT) {
- cmdarg[0] = "";
- cmdarg[1] = "";
- cmdname = "";
- } else {
- cmdarg[0] = " (--cmd=";
- cmdarg[1] = ")";
- cmdname = perk_cmd_name[cmd];
+ char header [2048];
+ char cmdname[128];
+
+ snprintf(cmdname,sizeof(cmdname),"%s%s%s",
+ program,
+ cmdarg ? " --cmd=" : "",
+ cmdarg ? perk_cmd_name[cmd] : "");
+
+ switch (cmd) {
+ case PERK_CMD_AR:
+ snprintf(header,sizeof(header),
+ PERK_AR_CMD_SYNOPSIS,
+ cmdname,cmdname,cmdname,cmdname,
+ cmdname,cmdname,cmdname,cmdname,
+ cmdname,cmdname,cmdname,cmdname,
+ cmdname,cmdname,cmdname);
+ break;
+
+ case PERK_CMD_PERK:
+ snprintf(header,sizeof(header),
+ PERK_PERK_CMD_SYNOPSIS,
+ cmdname,cmdname,cmdname);
+ break;
+
+ default:
+ snprintf(header,sizeof(header),
+ PERK_DEFAULT_CMD_SYNOPSIS,
+ program,program,program,program);
+ break;
}
- snprintf(header,sizeof(header),
- "Usage: %s [options] ...\n"
- "Usage: %s [options] [--cmd=<command>] <arg> <arg> ...\n\n"
- "Notes: --cmd must precede all non-option arguments, as well as\n"
- " all arguments that are specific to the selected command.\n\n"
- "Options%s%s%s:\n",
- program,program,cmdarg[0],cmdname,cmdarg[1]);
-
argv_usage(fdout,header,optv,arg);
argv_free(meta);
@@ -160,6 +173,9 @@ static int pe_cmd_from_program(const char * program)
if (!strcmp(mark,"perk")) {
return PERK_CMD_PERK;
+ } else if (!strcmp(mark,"ar")) {
+ return PERK_CMD_AR;
+
} else {
return PERK_CMD_DEFAULT;
}
@@ -171,7 +187,8 @@ static int pe_cctx_update(
struct argv_meta * meta,
const struct pe_fd_ctx * fdctx,
struct pe_common_ctx * cctx,
- size_t * nunits)
+ size_t * nunits,
+ const char * cmdarg)
{
struct argv_entry * entry;
const char * pretty;
@@ -186,7 +203,7 @@ static int pe_cctx_update(
return pe_driver_usage(
fdctx->fdout,
program,entry->arg,
- optv,0,cctx->cmd);
+ optv,0,cmdarg,cctx->cmd);
break;
case TAG_CMD:
@@ -194,9 +211,10 @@ static int pe_cctx_update(
return pe_driver_usage(
fdctx->fderr,
program,0,
- optv,0,cctx->cmd);
+ optv,0,cmdarg,cctx->cmd);
cctx->cmd = pe_cmd_from_program(entry->arg);
+ cmdarg = entry->arg;
break;
case TAG_VERSION:
@@ -207,6 +225,10 @@ static int pe_cctx_update(
pretty = entry->arg;
break;
+ case TAG_VERBOSE:
+ cctx->fmtflags |= PERK_PRETTY_VERBOSE;
+ break;
+
case TAG_CATEGORY:
cctx->fmtflags |= PERK_OUTPUT_IMAGE_CATEGORY;
break;
@@ -279,6 +301,15 @@ static int pe_cctx_update(
cctx->hdrdump = PERK_HDRDUMP_IMPORT_TABLE;
}
break;
+
+ /*---ar---*/
+ case TAG_AR_LIST_MEMBERS:
+ cctx->drvflags |= PERK_DRIVER_AR_LIST_MEMBERS;
+ break;
+
+ case TAG_AR_PRINT_MEMBERS:
+ cctx->drvflags |= PERK_DRIVER_AR_PRINT_MEMBERS;
+ break;
}
} else {
(*nunits)++;
@@ -288,6 +319,12 @@ static int pe_cctx_update(
if (pretty && !strcmp(pretty,"yaml")) {
cctx->fmtflags |= PERK_PRETTY_YAML;
+ } else if (pretty && !strcmp(pretty,"posix")) {
+ cctx->fmtflags |= PERK_PRETTY_POSIX;
+
+ } else if (pretty && !strcmp(pretty,"hexdata")) {
+ cctx->fmtflags |= PERK_PRETTY_HEXDATA;
+
} else if (pretty && !strcmp(pretty,"dlltool")) {
cctx->fmtflags |= PERK_PRETTY_DLLTOOL;
}
@@ -314,10 +351,12 @@ int pe_lib_get_driver_ctx(
struct argv_meta * meta;
size_t nunits;
const char * program;
+ const char * cmdarg;
char ** parg;
char ** pargcap;
char ** cmdargv;
char * cmdmark;
+ char stckarg[64];
struct argv_ctx actx = {ARGV_VERBOSITY_NONE,
ARGV_MODE_SCAN,
0,0,0,0,0,0,0,0};
@@ -336,6 +375,7 @@ int pe_lib_get_driver_ctx(
cctx.cmd = pe_cmd_from_program(program);
cctx.drvflags = flags;
nunits = 0;
+ cmdarg = 0;
/* missing arguments? */
argv_optv_init(perk_cmd_options[cctx.cmd],optv);
@@ -344,7 +384,18 @@ int pe_lib_get_driver_ctx(
return pe_driver_usage(
fdctx->fderr,
program,0,
- optv,0,cctx.cmd);
+ optv,0,0,cctx.cmd);
+
+ /* historic ar usage (vector will be cloned, so stack var is fine) */
+ if (cctx.cmd == PERK_CMD_AR) {
+ if (argv && argv[0] && argv[1] && (argv[1][0] != '-')) {
+ if (strlen(argv[1]) < (sizeof(stckarg) - 1)) {
+ stckarg[0] = '-';
+ strcpy(&stckarg[1],argv[1]);
+ argv[1] = stckarg;
+ }
+ }
+ }
/* initial argv scan: ... --cmd=xxx ... */
argv_scan(argv,optv,&actx,0);
@@ -365,9 +416,11 @@ int pe_lib_get_driver_ctx(
if (!strcmp(*parg,"--cmd") && parg[1]) {
cmdargv = &parg[2];
cmdmark = parg[2];
+ cmdarg = parg[1];
} else if (!strncmp(*parg,"--cmd=",6)) {
cmdargv = &parg[1];
cmdmark = parg[1];
+ cmdarg = &parg[0][6];
}
}
@@ -399,7 +452,8 @@ int pe_lib_get_driver_ctx(
if (pe_cctx_update(
program,optv,meta,
- fdctx,&cctx,&nunits)) {
+ fdctx,&cctx,&nunits,
+ cmdarg)) {
argv_free(meta);
return -1;
}
@@ -417,6 +471,9 @@ int pe_lib_get_driver_ctx(
} else if (cctx.cmd == PERK_CMD_PERK) {
argv_optv_init(pe_perk_options,optv);
+
+ } else if (cctx.cmd == PERK_CMD_AR) {
+ argv_optv_init(pe_ar_options,optv);
}
/* process the selected tool's command-line arguments */
@@ -428,7 +485,8 @@ int pe_lib_get_driver_ctx(
if (pe_cctx_update(
program,optv,meta,
- fdctx,&cctx,&nunits)) {
+ fdctx,&cctx,&nunits,
+ cmdarg)) {
argv_free(meta);
return -1;
}
@@ -438,8 +496,8 @@ int pe_lib_get_driver_ctx(
if (!nunits && !(cctx.drvflags & PERK_DRIVER_VERSION))
return pe_driver_usage(
fdctx->fdout,
- program,0,
- optv,meta,cctx.cmd);
+ program,0,optv,meta,
+ cmdarg,cctx.cmd);
/* context allocation */
if (!(ctx = pe_driver_ctx_alloc(meta,fdctx,&cctx,nunits)))
diff --git a/src/driver/pe_unit_ctx.c b/src/driver/pe_unit_ctx.c
index d1fea0e..b165226 100644
--- a/src/driver/pe_unit_ctx.c
+++ b/src/driver/pe_unit_ctx.c
@@ -11,20 +11,127 @@
#include <sys/mman.h>
#include <perk/perk.h>
+#include <perk/perk_arbits.h>
+#include "perk_ar_impl.h"
#include "perk_driver_impl.h"
#include "perk_errinfo_impl.h"
static int pe_lib_free_unit_ctx_impl(struct pe_unit_ctx_impl * ctx, int ret)
{
+ struct pe_image_meta ** pmeta;
if (ctx) {
+ for (pmeta=ctx->objmeta; pmeta && *pmeta; pmeta++)
+ pe_meta_free_image_meta(*pmeta);
+
+ pe_ar_free_archive_meta(ctx->armeta);
pe_meta_free_image_meta(ctx->meta);
pe_raw_unmap_raw_image(&ctx->map);
+ free(ctx->usrobjmeta);
+ free(ctx->objmeta);
free(ctx);
}
return ret;
}
+static int pe_lib_create_object_vector_or_verify_archive(
+ const struct pe_driver_ctx * dctx,
+ struct pe_unit_ctx_impl * ctx)
+{
+ struct pe_archive_meta * actx;
+ struct pe_archive_meta_impl * ictx;
+ struct pe_driver_ctx_impl * idctx;
+ bool fvector;
+ bool fstrict;
+ bool fpurearch;
+ struct pe_image_meta * meta;
+ struct pe_image_meta ** objmeta;
+ const struct pe_image_meta ** usrobjmeta;
+ size_t veclen;
+ struct pe_raw_image map;
+ struct ar_meta_member_info ** pmember;
+ struct pe_error_info ** errinfp;
+ enum pe_abi m_abi;
+ enum pe_subtype m_subtype;
+
+ fvector = (dctx->cctx->drvflags & PERK_DRIVER_AR_OBJECT_VECTOR);
+ fstrict = (dctx->cctx->drvflags & PERK_DRIVER_AR_STRICT_PE);
+ fpurearch = (dctx->cctx->drvflags & PERK_DRIVER_AR_STRICT_PE_ARCH);
+
+ if (!fvector && !fstrict && !fpurearch)
+ return 0;
+
+ actx = ctx->armeta;
+ ictx = pe_archive_meta_ictx(actx);
+ idctx = pe_get_driver_ictx(dctx);
+ veclen = ictx->nentries + 1;
+
+ if (fvector && !(ctx->objmeta = calloc(veclen,sizeof(meta))))
+ return PERK_BUFFER_ERROR(dctx);
+
+ if (fvector && !(ctx->usrobjmeta = calloc(veclen,sizeof(*usrobjmeta))))
+ return PERK_BUFFER_ERROR(dctx);
+
+ if (!actx->a_memberv)
+ return 0;
+
+ objmeta = ctx->objmeta;
+ usrobjmeta = ctx->usrobjmeta;
+
+ for (pmember=actx->a_memberv; *pmember; pmember++) {
+ errinfp = idctx->errinfp;
+
+ switch (pmember[0]->ar_member_attr) {
+ case AR_MEMBER_ATTR_ARCHIVE:
+ return PERK_CUSTOM_ERROR(dctx,
+ PERK_ERR_AR_NESTED_ARCHIVE);
+
+ case AR_MEMBER_ATTR_ARMAP:
+ case AR_MEMBER_ATTR_NAMESTRS:
+ case AR_MEMBER_ATTR_LINKINFO:
+ break;
+
+ default:
+ map.map_addr = pmember[0]->ar_object_data;
+ map.map_size = pmember[0]->ar_object_size;
+
+ if (!pe_meta_get_image_meta(dctx,&map,&meta)) {
+ if (fpurearch && (objmeta == ctx->objmeta)) {
+ m_abi = meta->m_abi;
+ m_subtype = meta->m_subtype;
+
+ } else if (fpurearch) {
+ if ((meta->m_abi != m_abi) || (meta->m_subtype != m_subtype))
+ return PERK_CUSTOM_ERROR(dctx,
+ PERK_ERR_AR_MIXED_PE_MEMBERS);
+ }
+
+ if (fvector) {
+ *objmeta++ = meta;
+ *usrobjmeta++ = meta;
+ } else {
+ pe_meta_free_image_meta(meta);
+ };
+
+
+ } else if (fstrict || fpurearch) {
+ return PERK_CUSTOM_ERROR(dctx,
+ PERK_ERR_AR_NON_PE_MEMBERS);
+
+ } else {
+ idctx->errinfp = errinfp;
+
+ for (; *errinfp; )
+ *errinfp++ = 0;
+ }
+
+ break;
+ }
+ }
+
+ return 0;
+}
+
int pe_lib_get_unit_ctx(
const struct pe_driver_ctx * dctx,
const char * path,
@@ -32,6 +139,8 @@ int pe_lib_get_unit_ctx(
{
struct pe_unit_ctx_impl * ctx;
int prot;
+ char * mark;
+ size_t siglen;
if (!dctx)
return PERK_CUSTOM_ERROR(
@@ -43,7 +152,7 @@ int pe_lib_get_unit_ctx(
pe_driver_set_ectx(
dctx,0,path);
- prot = (dctx->cctx->actflags & PERK_ACTION_MAP_READWRITE)
+ prot = (dctx->cctx->drvflags & PERK_DRIVER_MAP_WRITE_ACCESS)
? PROT_READ | PROT_WRITE
: PROT_READ;
@@ -51,14 +160,34 @@ int pe_lib_get_unit_ctx(
return pe_lib_free_unit_ctx_impl(ctx,
PERK_NESTED_ERROR(dctx));
- if (pe_meta_get_image_meta(dctx,&ctx->map,&ctx->meta))
+ if (ctx->map.map_size < (siglen = sizeof(struct ar_raw_signature)))
+ return pe_lib_free_unit_ctx_impl(ctx,
+ PERK_CUSTOM_ERROR(
+ dctx,
+ PERK_ERR_INVALID_IMAGE));
+
+ if (!strncmp((mark = ctx->map.map_addr),AR_SIGNATURE,siglen)) {
+ ctx->armap.map_addr = ctx->map.map_addr;
+ ctx->armap.map_size = ctx->map.map_size;
+
+ if (pe_ar_get_archive_meta(dctx,&ctx->armap,&ctx->armeta))
+ return pe_lib_free_unit_ctx_impl(ctx,
+ PERK_NESTED_ERROR(dctx));
+
+ if (pe_lib_create_object_vector_or_verify_archive(dctx,ctx) < 0)
+ return pe_lib_free_unit_ctx_impl(ctx,
+ PERK_NESTED_ERROR(dctx));
+
+ } else if (pe_meta_get_image_meta(dctx,&ctx->map,&ctx->meta)) {
return pe_lib_free_unit_ctx_impl(ctx,
PERK_NESTED_ERROR(dctx));
+ }
- ctx->path = path;
- ctx->uctx.path = &ctx->path;
- ctx->uctx.map = &ctx->map;
- ctx->uctx.meta = ctx->meta;
+ ctx->path = path;
+ ctx->uctx.path = &ctx->path;
+ ctx->uctx.meta = ctx->meta;
+ ctx->uctx.armeta = ctx->armeta;
+ ctx->uctx.objmeta = ctx->usrobjmeta;
*pctx = &ctx->uctx;
return 0;
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-07 17:54:44 +0000