diff options
Diffstat (limited to 'src/driver')
| -rw-r--r-- | src/driver/pe_amain.c | 12 | ||||
| -rw-r--r-- | src/driver/pe_driver_ctx.c | 54 |
2 files changed, 52 insertions, 14 deletions
diff --git a/src/driver/pe_amain.c b/src/driver/pe_amain.c index 5b85bef..63cec52 100644 --- a/src/driver/pe_amain.c +++ b/src/driver/pe_amain.c @@ -105,6 +105,18 @@ int pe_main(char ** argv, char ** envp, const struct pe_fd_ctx * fdctx) pe_cmd_common(dctx,pe_cmd_size); break; + case PERK_CMD_STRIP: + pe_cmd_common(dctx,pe_cmd_strip); + break; + + case PERK_CMD_RANLIB: + pe_cmd_common(dctx,pe_cmd_ranlib); + break; + + case PERK_CMD_STRINGS: + pe_cmd_common(dctx,pe_cmd_strings); + break; + case PERK_CMD_AR: arflags = dctx->cctx->drvflags; diff --git a/src/driver/pe_driver_ctx.c b/src/driver/pe_driver_ctx.c index a806083..955484a 100644 --- a/src/driver/pe_driver_ctx.c +++ b/src/driver/pe_driver_ctx.c @@ -31,6 +31,9 @@ static const char * const perk_cmd_name[PERK_CMD_CAP] = { [PERK_CMD_AR] = "ar", [PERK_CMD_NM] = "nm", [PERK_CMD_SIZE] = "size", + [PERK_CMD_STRIP] = "strip", + [PERK_CMD_RANLIB] = "ranlib", + [PERK_CMD_STRINGS] = "strings", }; /* perk command options */ @@ -40,6 +43,9 @@ static const struct argv_option * perk_cmd_options[PERK_CMD_CAP] = { [PERK_CMD_AR] = pe_ar_options, [PERK_CMD_NM] = pe_nm_options, [PERK_CMD_SIZE] = pe_size_options, + [PERK_CMD_STRIP] = pe_strip_options, + [PERK_CMD_RANLIB] = pe_ranlib_options, + [PERK_CMD_STRINGS] = pe_strings_options, }; /* default fd context */ @@ -114,6 +120,25 @@ static int pe_driver_usage( 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_RANLIB: + snprintf(header,sizeof(header), + PERK_RANLIB_CMD_SYNOPSIS, + cmdname,cmdname); + break; + + case PERK_CMD_STRINGS: + snprintf(header,sizeof(header), + PERK_STRINGS_CMD_SYNOPSIS, + cmdname,cmdname); + break; + case PERK_CMD_PERK: snprintf(header,sizeof(header), PERK_PERK_CMD_SYNOPSIS, @@ -175,6 +200,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,'-'); @@ -186,21 +212,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; - - } else if (!strcmp(mark,"nm")) { - return PERK_CMD_NM; - - } else if (!strcmp(mark,"size")) { - return PERK_CMD_SIZE; + 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( @@ -515,6 +532,15 @@ int pe_lib_get_driver_ctx( } 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); + + } else if (cctx.cmd == PERK_CMD_RANLIB) { + argv_optv_init(pe_ranlib_options,optv); + + } else if (cctx.cmd == PERK_CMD_STRINGS) { + argv_optv_init(pe_strings_options,optv); } /* process the selected tool's command-line arguments */ |