From d63dd27035006aa179176fe10d78486044c0dba0 Mon Sep 17 00:00:00 2001 From: midipix Date: Wed, 18 Jun 2025 16:34:36 +0000 Subject: driver: added --cmd=nm support, the pe_cmd_nm() stub, and the perk-nm symlink. --- src/cmds/pe_cmd_nm.c | 15 +++++++++++++++ src/driver/pe_amain.c | 5 +++++ src/driver/pe_driver_ctx.c | 14 ++++++++++++++ src/internal/perk_driver_impl.h | 1 + src/internal/perk_synopsis_impl.h | 6 ++++++ src/skin/pe_skin_default.c | 2 +- src/skin/pe_skin_nm.c | 13 +++++++++++++ 7 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 src/cmds/pe_cmd_nm.c create mode 100644 src/skin/pe_skin_nm.c (limited to 'src') diff --git a/src/cmds/pe_cmd_nm.c b/src/cmds/pe_cmd_nm.c new file mode 100644 index 0000000..87736ea --- /dev/null +++ b/src/cmds/pe_cmd_nm.c @@ -0,0 +1,15 @@ +/***************************************************************/ +/* perk: PE Resource Kit */ +/* Copyright (C) 2015--2025 SysDeer Technologies, LLC */ +/* Released under GPLv2 and GPLv3; see COPYING.PERK. */ +/***************************************************************/ + +#include +#include "perk_driver_impl.h" + +int pe_cmd_nm(const struct pe_driver_ctx * dctx, const char * path) +{ + (void)dctx; + (void)path; + return 0; +} diff --git a/src/driver/pe_amain.c b/src/driver/pe_amain.c index 547714a..06ef082 100644 --- a/src/driver/pe_amain.c +++ b/src/driver/pe_amain.c @@ -104,6 +104,11 @@ int pe_main(char ** argv, char ** envp, const struct pe_fd_ctx * fdctx) break; + case PERK_CMD_NM: + for (unit=dctx->units; *unit; unit++) + pe_cmd_nm(dctx,*unit); + break; + default: break; } diff --git a/src/driver/pe_driver_ctx.c b/src/driver/pe_driver_ctx.c index 9e6a17e..bbd5195 100644 --- a/src/driver/pe_driver_ctx.c +++ b/src/driver/pe_driver_ctx.c @@ -29,6 +29,7 @@ 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 command options */ @@ -36,6 +37,7 @@ 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, }; /* default fd context */ @@ -98,6 +100,12 @@ 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_PERK: snprintf(header,sizeof(header), PERK_PERK_CMD_SYNOPSIS, @@ -176,6 +184,9 @@ static int pe_cmd_from_program(const char * program) } else if (!strcmp(mark,"ar")) { return PERK_CMD_AR; + } else if (!strcmp(mark,"nm")) { + return PERK_CMD_NM; + } else { return PERK_CMD_DEFAULT; } @@ -487,6 +498,9 @@ 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); } /* process the selected tool's command-line arguments */ diff --git a/src/internal/perk_driver_impl.h b/src/internal/perk_driver_impl.h index fdf75c3..368fb7f 100644 --- a/src/internal/perk_driver_impl.h +++ b/src/internal/perk_driver_impl.h @@ -15,6 +15,7 @@ extern const struct argv_option pe_default_options[]; extern const struct argv_option pe_perk_options[]; extern const struct argv_option pe_ar_options[]; +extern const struct argv_option pe_nm_options[]; enum app_tags { TAG_HELP, diff --git a/src/internal/perk_synopsis_impl.h b/src/internal/perk_synopsis_impl.h index f3d0a3a..b1d59a8 100644 --- a/src/internal/perk_synopsis_impl.h +++ b/src/internal/perk_synopsis_impl.h @@ -22,6 +22,12 @@ " %s [option] ... ...\n\n" \ "Options:\n" +#define PERK_NM_CMD_SYNOPSIS \ + "%s — PE/COFF Name Mangler\n\n" \ + "Synopsis:\n" \ + " %s [-V] [-APv] [-efox] [-g|-u] [-t format] ...\n\n" \ + "Options:\n" + #define PERK_AR_CMD_SYNOPSIS \ "%s — the PE/COFF Resource Kit Archiver\n\n" \ "Synopsis:\n" \ diff --git a/src/skin/pe_skin_default.c b/src/skin/pe_skin_default.c index 95024c7..bd08f1f 100644 --- a/src/skin/pe_skin_default.c +++ b/src/skin/pe_skin_default.c @@ -10,7 +10,7 @@ const perk_hidden struct argv_option pe_default_options[] = { "show usage information [listing %s options only]"}, {"cmd", 0,TAG_CMD,ARGV_OPTARG_REQUIRED,0, - "perk|ar",0, + "perk|ar|nm",0, "invoke one of the following perk commands: {%s}"}, {0,0,0,0,0,0,0,0} diff --git a/src/skin/pe_skin_nm.c b/src/skin/pe_skin_nm.c new file mode 100644 index 0000000..2525b9a --- /dev/null +++ b/src/skin/pe_skin_nm.c @@ -0,0 +1,13 @@ +#include "perk_driver_impl.h" +#include "perk_visibility_impl.h" +#include "argv/argv.h" + +const perk_hidden struct argv_option pe_nm_options[] = { + {"version", 'V',TAG_VERSION,ARGV_OPTARG_NONE,0,0,0, + "show version information"}, + + {"help", 'h',TAG_HELP,ARGV_OPTARG_OPTIONAL,0,"short|long",0, + "show usage information [listing %s options only]"}, + + {0,0,0,0,0,0,0,0} +}; -- cgit v1.2.3