diff options
Diffstat (limited to 'src/driver')
| -rw-r--r-- | src/driver/pe_amain.c | 24 | ||||
| -rw-r--r-- | src/driver/pe_driver_ctx.c | 52 |
2 files changed, 65 insertions, 11 deletions
diff --git a/src/driver/pe_amain.c b/src/driver/pe_amain.c index 547714a..5b85bef 100644 --- a/src/driver/pe_amain.c +++ b/src/driver/pe_amain.c @@ -57,13 +57,24 @@ static int pe_exit(struct pe_driver_ctx * dctx, int ret) return ret; } +typedef int (*pe_cmd)(const struct pe_driver_ctx *, const char *); + +static void pe_cmd_common( + const struct pe_driver_ctx * dctx, + pe_cmd cmdfn) +{ + const char ** unit; + + for (unit=dctx->units; *unit; unit++) + cmdfn(dctx,*unit); +} + int pe_main(char ** argv, char ** envp, const struct pe_fd_ctx * fdctx) { int ret; int fdout; uint64_t flags; struct pe_driver_ctx * dctx; - const char ** unit; const char * posname; const char * arname; const char ** arfiles; @@ -83,8 +94,15 @@ int pe_main(char ** argv, char ** envp, const struct pe_fd_ctx * fdctx) switch (dctx->cctx->cmd) { case PERK_CMD_PERK: - for (unit=dctx->units; *unit; unit++) - pe_cmd_perk(dctx,*unit); + pe_cmd_common(dctx,pe_cmd_perk); + break; + + case PERK_CMD_NM: + pe_cmd_common(dctx,pe_cmd_nm); + break; + + case PERK_CMD_SIZE: + pe_cmd_common(dctx,pe_cmd_size); break; case PERK_CMD_AR: diff --git a/src/driver/pe_driver_ctx.c b/src/driver/pe_driver_ctx.c index 6a260bd..43dc0b3 100644 --- a/src/driver/pe_driver_ctx.c +++ b/src/driver/pe_driver_ctx.c @@ -29,6 +29,9 @@ static const struct pe_source_version pe_src_version = { static const char * const perk_cmd_name[PERK_CMD_CAP] = { [PERK_CMD_PERK] = "perk", [PERK_CMD_AR] = "ar", + [PERK_CMD_NM] = "nm", + [PERK_CMD_SIZE] = "size", + [PERK_CMD_STRIP] = "strip", }; /* perk command options */ @@ -36,6 +39,9 @@ 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, + [PERK_CMD_NM] = pe_nm_options, + [PERK_CMD_SIZE] = pe_size_options, + [PERK_CMD_STRIP] = pe_strip_options, }; /* default fd context */ @@ -98,6 +104,25 @@ static int pe_driver_usage( cmdname,cmdname,cmdname); break; + case PERK_CMD_NM: + snprintf(header,sizeof(header), + PERK_NM_CMD_SYNOPSIS, + cmdname,cmdname); + break; + + case PERK_CMD_SIZE: + snprintf(header,sizeof(header), + PERK_SIZE_CMD_SYNOPSIS, + cmdname,cmdname); + break; + + case PERK_CMD_STRIP: + snprintf(header,sizeof(header), + PERK_STRIP_CMD_SYNOPSIS, + cmdname,cmdname,cmdname,cmdname, + cmdname,cmdname,cmdname); + break; + case PERK_CMD_PERK: snprintf(header,sizeof(header), PERK_PERK_CMD_SYNOPSIS, @@ -159,6 +184,7 @@ static int pe_cmd_from_program(const char * program) const char * dot; const char * hyphen; const char * mark; + enum pe_cmd cmd; dot = strrchr(program,'.'); hyphen = strrchr(program,'-'); @@ -170,15 +196,12 @@ static int pe_cmd_from_program(const char * program) else mark = program; - if (!strcmp(mark,"perk")) { - return PERK_CMD_PERK; - - } else if (!strcmp(mark,"ar")) { - return PERK_CMD_AR; + for (cmd=0; cmd<PERK_CMD_CAP; cmd++) + if (perk_cmd_name[cmd]) + if (!strcmp(mark,perk_cmd_name[cmd])) + return cmd; - } else { - return PERK_CMD_DEFAULT; - } + return PERK_CMD_DEFAULT; } static int pe_cctx_update( @@ -251,6 +274,10 @@ static int pe_cctx_update( cctx->fmtflags |= PERK_OUTPUT_IMAGE_STRINGS; break; + case TAG_RELOCS: + cctx->fmtflags |= PERK_OUTPUT_BASE_RELOCS; + break; + case TAG_EXPSYMS: cctx->fmtflags |= PERK_OUTPUT_EXPORT_SYMS; break; @@ -483,6 +510,15 @@ int pe_lib_get_driver_ctx( } else if (cctx.cmd == PERK_CMD_AR) { argv_optv_init(pe_ar_options,optv); + + } else if (cctx.cmd == PERK_CMD_NM) { + argv_optv_init(pe_nm_options,optv); + + } else if (cctx.cmd == PERK_CMD_SIZE) { + argv_optv_init(pe_size_options,optv); + + } else if (cctx.cmd == PERK_CMD_STRIP) { + argv_optv_init(pe_strip_options,optv); } /* process the selected tool's command-line arguments */ |