From 119ad0852ff3d5853777054ff8428bc4d0417bb6 Mon Sep 17 00:00:00 2001 From: midipix Date: Jun 13 2025 12:27:35 +0000 Subject: api: renamed pe_output_image_strings() as pe_output_pecoff_strings(). --- diff --git a/include/perk/perk.h b/include/perk/perk.h index c1589f1..fae004a 100644 --- a/include/perk/perk.h +++ b/include/perk/perk.h @@ -299,7 +299,7 @@ perk_api int pe_main (char **, char **, const struct perk_api int pe_output_pecoff_category (const struct pe_driver_ctx *, const struct pe_image_meta *); perk_api int pe_output_pecoff_sections (const struct pe_driver_ctx *, const struct pe_image_meta *); perk_api int pe_output_image_symbols (const struct pe_driver_ctx *, const struct pe_image_meta *); -perk_api int pe_output_image_strings (const struct pe_driver_ctx *, const struct pe_image_meta *); +perk_api int pe_output_pecoff_strings (const struct pe_driver_ctx *, const struct pe_image_meta *); perk_api int pe_output_export_symbols (const struct pe_driver_ctx *, const struct pe_image_meta *); perk_api int pe_output_import_libraries (const struct pe_driver_ctx *, const struct pe_image_meta *); perk_api int pe_output_mdso_libraries (const struct pe_driver_ctx *, const struct pe_image_meta *); diff --git a/project/common.mk b/project/common.mk index 56c7c57..cb78725 100644 --- a/project/common.mk +++ b/project/common.mk @@ -30,7 +30,7 @@ API_SRCS = \ src/output/pe_output_export_symbols.c \ src/output/pe_output_pecoff_category.c \ src/output/pe_output_pecoff_sections.c \ - src/output/pe_output_image_strings.c \ + src/output/pe_output_pecoff_strings.c \ src/output/pe_output_image_symbols.c \ src/output/pe_output_idata_libraries.c \ src/output/pe_output_mdso_libraries.c \ diff --git a/src/cmds/pe_cmd_perk.c b/src/cmds/pe_cmd_perk.c index fa59735..b22643e 100644 --- a/src/cmds/pe_cmd_perk.c +++ b/src/cmds/pe_cmd_perk.c @@ -53,7 +53,7 @@ static void pe_perform_unit_actions_impl( pe_output_image_symbols(dctx,meta); if (flags & PERK_OUTPUT_IMAGE_STRINGS) - pe_output_image_strings(dctx,meta); + pe_output_pecoff_strings(dctx,meta); if (flags & PERK_OUTPUT_EXPORT_SYMS) pe_output_export_symbols(dctx,meta); diff --git a/src/output/pe_output_image_strings.c b/src/output/pe_output_image_strings.c deleted file mode 100644 index a0ca849..0000000 --- a/src/output/pe_output_image_strings.c +++ /dev/null @@ -1,53 +0,0 @@ -/***************************************************************/ -/* perk: PE Resource Kit */ -/* Copyright (C) 2015--2025 SysDeer Technologies, LLC */ -/* Released under GPLv2 and GPLv3; see COPYING.PERK. */ -/***************************************************************/ - -#include -#include - -#include -#include -#include "perk_reader_impl.h" -#include "perk_driver_impl.h" -#include "perk_dprintf_impl.h" -#include "perk_errinfo_impl.h" - -int pe_output_image_strings( - const struct pe_driver_ctx * dctx, - const struct pe_image_meta * meta) -{ - int fdout; - const char * ch; - const char * mark; - const char * cap; - const char * dash = ""; - - fdout = pe_driver_fdout(dctx); - - if (dctx->cctx->fmtflags & PERK_PRETTY_YAML) { - if (pe_dprintf(fdout,"strings:\n") < 0) - return PERK_FILE_ERROR(dctx); - - dash = "- "; - } - - mark = (char *)meta->r_image.map_addr; - mark += meta->m_coff.cfh_ptr_to_str_tbl; - - cap = mark + meta->m_coff.cfh_size_of_str_tbl; - mark += sizeof(uint32_t); - - for (ch=mark; ch +#include + +#include +#include +#include "perk_reader_impl.h" +#include "perk_driver_impl.h" +#include "perk_dprintf_impl.h" +#include "perk_errinfo_impl.h" + +int pe_output_pecoff_strings( + const struct pe_driver_ctx * dctx, + const struct pe_image_meta * meta) +{ + int fdout; + const char * ch; + const char * mark; + const char * cap; + const char * dash = ""; + + fdout = pe_driver_fdout(dctx); + + if (dctx->cctx->fmtflags & PERK_PRETTY_YAML) { + if (pe_dprintf(fdout,"strings:\n") < 0) + return PERK_FILE_ERROR(dctx); + + dash = "- "; + } + + mark = (char *)meta->r_image.map_addr; + mark += meta->m_coff.cfh_ptr_to_str_tbl; + + cap = mark + meta->m_coff.cfh_size_of_str_tbl; + mark += sizeof(uint32_t); + + for (ch=mark; ch