diff options
| -rw-r--r-- | include/perk/perk.h | 1 | ||||
| -rw-r--r-- | src/cmds/pe_cmd_ar.c | 41 | ||||
| -rw-r--r-- | src/driver/pe_driver_ctx.c | 5 | ||||
| -rw-r--r-- | src/internal/perk_driver_impl.h | 1 | ||||
| -rw-r--r-- | src/output/pe_output_error.c | 1 | ||||
| -rw-r--r-- | src/skin/pe_skin_ar.c | 16 |
6 files changed, 61 insertions, 4 deletions
diff --git a/include/perk/perk.h b/include/perk/perk.h index 976159a..05ed665 100644 --- a/include/perk/perk.h +++ b/include/perk/perk.h @@ -102,6 +102,7 @@ enum pe_custom_error { PERK_ERR_AR_DLUNIT_NOT_SPECIFIED, PERK_ERR_AR_OUTPUT_NOT_SPECIFIED, PERK_ERR_AR_OUTPUT_NOT_APPLICABLE, + PERK_ERR_AR_NON_ARCHIVE_IMAGE, PERK_ERR_AR_NON_PE_MEMBERS, PERK_ERR_AR_MIXED_PE_MEMBERS, PERK_ERR_AR_NESTED_ARCHIVE, diff --git a/src/cmds/pe_cmd_ar.c b/src/cmds/pe_cmd_ar.c index 4b4f284..feb579c 100644 --- a/src/cmds/pe_cmd_ar.c +++ b/src/cmds/pe_cmd_ar.c @@ -9,12 +9,38 @@ #include "perk_errinfo_impl.h" #include "perk_ar_impl.h" +int pe_ar_list_members(const struct pe_archive_meta *, const char **); + +static int pe_cmd_ar_list_members( + const struct pe_driver_ctx * dctx, + const char * arname, + const char ** members) +{ + struct pe_unit_ctx * arctx = 0; + + if (pe_lib_get_unit_ctx(dctx,arname,&arctx) < 0) + return PERK_NESTED_ERROR(dctx); + + if (arctx->armeta == 0) + return PERK_CUSTOM_ERROR(dctx, + PERK_ERR_AR_NON_ARCHIVE_IMAGE); + + if (pe_ar_list_members(arctx->armeta,members) < 0) { + pe_lib_free_unit_ctx(arctx); + return PERK_NESTED_ERROR(dctx); + } + + pe_lib_free_unit_ctx(arctx); + + return 0; +} + static int pe_cmd_ar_verify_cmdline( const struct pe_driver_ctx * dctx, uint64_t flags, const char * posname, const char * arname, - const char ** units) + const char ** members) { uint64_t action; uint64_t poscmd; @@ -24,7 +50,7 @@ static int pe_cmd_ar_verify_cmdline( poscmd = (flags & AR_POSNAME_MASK); vercmd = (flags & PERK_DRIVER_VERSION); - if (vercmd && !posname && !arname && !units) + if (vercmd && !posname && !arname && !members) return 0; switch (action) { @@ -82,10 +108,17 @@ int pe_cmd_ar( uint64_t flags, const char * posname, const char * arname, - const char ** units) + const char ** members) { - if (pe_cmd_ar_verify_cmdline(dctx,flags,posname,arname,units) < 0) + if (pe_cmd_ar_verify_cmdline(dctx,flags,posname,arname,members) < 0) return PERK_NESTED_ERROR(dctx); + switch (flags & AR_ACTION_MASK) { + case PERK_DRIVER_AR_LIST_MEMBERS: + return pe_cmd_ar_list_members( + dctx,arname,members); + + } + return 0; } diff --git a/src/driver/pe_driver_ctx.c b/src/driver/pe_driver_ctx.c index af9a30d..9290681 100644 --- a/src/driver/pe_driver_ctx.c +++ b/src/driver/pe_driver_ctx.c @@ -301,6 +301,11 @@ 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; } } else { (*nunits)++; diff --git a/src/internal/perk_driver_impl.h b/src/internal/perk_driver_impl.h index 569d2d2..017638f 100644 --- a/src/internal/perk_driver_impl.h +++ b/src/internal/perk_driver_impl.h @@ -32,6 +32,7 @@ enum app_tags { TAG_DSOLIBS, TAG_DSOSYMS, TAG_HDRDUMP, + TAG_AR_LIST_MEMBERS, }; struct pe_driver_ctx_impl { diff --git a/src/output/pe_output_error.c b/src/output/pe_output_error.c index 9635d13..50c7357 100644 --- a/src/output/pe_output_error.c +++ b/src/output/pe_output_error.c @@ -35,6 +35,7 @@ static const char * const pe_error_strings[PERK_ERR_CAP] = { [PERK_ERR_BAD_IMAGE_TYPE] = "bad PE image type", [PERK_ERR_UNSUPPORTED_ABI] = "unsupported image abi", + [PERK_ERR_AR_NON_ARCHIVE_IMAGE]= "the parsed PE/COFF object or image is not an archive", [PERK_ERR_AR_NON_PE_MEMBERS] = "format of current archive member is not PE/COFF", [PERK_ERR_AR_MIXED_PE_MEMBERS] = "archive mixes objects of different architectures", [PERK_ERR_AR_NESTED_ARCHIVE] = "nested archives are currently not supported", diff --git a/src/skin/pe_skin_ar.c b/src/skin/pe_skin_ar.c index e99ee37..639ce9a 100644 --- a/src/skin/pe_skin_ar.c +++ b/src/skin/pe_skin_ar.c @@ -11,5 +11,21 @@ const perk_hidden struct argv_option pe_ar_options[] = { ARGV_OPTION_HYBRID_ONLY,0,0, "show usage information"}, + {"Wverbose", 'v',TAG_VERBOSE,ARGV_OPTARG_NONE, + ARGV_OPTION_HYBRID_ONLY,0,0, + "provide verbose output"}, + + {"Wlist", 't',TAG_AR_LIST_MEMBERS,ARGV_OPTARG_NONE, + ARGV_OPTION_HYBRID_ONLY,0,0, + "list archive members; names only be default, " + "or otherwise a detailed table of contents in " + "verbose mode"}, + + {"Wpretty", 0,TAG_PRETTY,ARGV_OPTARG_REQUIRED, + ARGV_OPTION_HYBRID_ONLY|ARGV_OPTION_HYBRID_EQUAL, + "yaml|posix|hexdata",0, + "list archive members or print content " + "using the %s format specification"}, + {0,0,0,0,0,0,0,0} }; |