summaryrefslogtreecommitdiffhomepage
path: root/src/driver/pe_driver_ctx.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/driver/pe_driver_ctx.c')
-rw-r--r--src/driver/pe_driver_ctx.c114
1 files changed, 86 insertions, 28 deletions
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)))