summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/arbits/output/pe_ar_list_members.c48
-rw-r--r--src/arbits/output/pe_ar_print_members.c181
-rw-r--r--src/cmds/pe_cmd_ar.c53
-rw-r--r--src/driver/pe_amain.c2
-rw-r--r--src/driver/pe_driver_ctx.c9
-rw-r--r--src/internal/perk_ar_impl.h2
-rw-r--r--src/internal/perk_driver_impl.h2
-rw-r--r--src/internal/perk_synopsis_impl.h10
-rw-r--r--src/output/pe_output_error.c1
-rw-r--r--src/skin/pe_skin_ar.c20
10 files changed, 293 insertions, 35 deletions
diff --git a/src/arbits/output/pe_ar_list_members.c b/src/arbits/output/pe_ar_list_members.c
index b1e3514..3e0aaa4 100644
--- a/src/arbits/output/pe_ar_list_members.c
+++ b/src/arbits/output/pe_ar_list_members.c
@@ -62,6 +62,10 @@ static struct ar_meta_member_info * pe_ar_get_member_info(
const char * name)
{
struct ar_meta_member_info ** memberp;
+ const char * slash;
+
+ if ((slash = strrchr(name,'/')))
+ name = ++slash;
for (memberp=meta->a_memberv; *memberp; memberp++)
if (!strcmp(memberp[0]->ar_file_header.ar_member_name,name))
@@ -73,13 +77,13 @@ static struct ar_meta_member_info * pe_ar_get_member_info(
}
static int pe_ar_member_in_members(
- struct ar_meta_member_info * member,
+ struct ar_meta_member_info * minfo,
const char ** members)
{
const char ** pname;
for (pname=members; *pname; pname++)
- if (!strcmp(*pname,member->ar_file_header.ar_member_name))
+ if (!strcmp(*pname,minfo->ar_file_header.ar_member_name))
return 1;
return 0;
@@ -87,16 +91,16 @@ static int pe_ar_member_in_members(
static int pe_ar_list_one_member_posix(
int fdout,
- struct ar_meta_member_info * memberp)
+ struct ar_meta_member_info * minfo)
{
return pe_dprintf(
fdout,"%s\n",
- memberp->ar_file_header.ar_member_name);
+ minfo->ar_file_header.ar_member_name);
}
static int pe_ar_list_one_member_posix_verbose(
int fdout,
- struct ar_meta_member_info * memberp,
+ struct ar_meta_member_info * minfo,
const char * fmtstr,
locale_t arlocale)
{
@@ -107,10 +111,10 @@ static int pe_ar_list_one_member_posix_verbose(
struct tm artimeloc;
char artimestr[64] = {0};
- ownerbits = (memberp->ar_file_header.ar_file_mode & 0700) >> 6;
- groupbits = (memberp->ar_file_header.ar_file_mode & 0070) >> 3;
- worldbits = (memberp->ar_file_header.ar_file_mode & 0007);
- artimeval = memberp->ar_file_header.ar_time_date_stamp;
+ ownerbits = (minfo->ar_file_header.ar_file_mode & 0700) >> 6;
+ groupbits = (minfo->ar_file_header.ar_file_mode & 0070) >> 3;
+ worldbits = (minfo->ar_file_header.ar_file_mode & 0007);
+ artimeval = minfo->ar_file_header.ar_time_date_stamp;
if (localtime_r(&artimeval,&artimeloc))
strftime_l(
@@ -123,11 +127,11 @@ static int pe_ar_list_one_member_posix_verbose(
pe_ar_perm_strs[ownerbits],
pe_ar_perm_strs[groupbits],
pe_ar_perm_strs[worldbits],
- memberp->ar_file_header.ar_uid,
- memberp->ar_file_header.ar_gid,
- memberp->ar_object_size,
+ minfo->ar_file_header.ar_uid,
+ minfo->ar_file_header.ar_gid,
+ minfo->ar_object_size,
artimestr,
- memberp->ar_file_header.ar_member_name);
+ minfo->ar_file_header.ar_member_name);
}
static int pe_ar_list_members_posix(
@@ -234,24 +238,24 @@ static int pe_ar_list_members_posix(
static int pe_ar_list_one_member_yaml(
int fdout,
- struct ar_meta_member_info * memberp)
+ struct ar_meta_member_info * minfo)
{
return pe_dprintf(
fdout,
" - [ member: %s ]\n",
- memberp->ar_file_header.ar_member_name);
+ minfo->ar_file_header.ar_member_name);
}
static int pe_ar_list_one_member_yaml_verbose(
int fdout,
- struct ar_meta_member_info * memberp,
+ struct ar_meta_member_info * minfo,
locale_t arlocale)
{
time_t artimeval;
struct tm artimeloc;
char artimestr[64] = {0};
- artimeval = memberp->ar_file_header.ar_time_date_stamp;
+ artimeval = minfo->ar_file_header.ar_time_date_stamp;
if (localtime_r(&artimeval,&artimeloc))
strftime_l(
@@ -268,12 +272,12 @@ static int pe_ar_list_one_member_yaml_verbose(
" - [ uid: " "%d" " ]\n"
" - [ gid: " "%d" " ]\n"
" - [ mode: " "%d" " ]\n\n",
- memberp->ar_file_header.ar_member_name,
+ minfo->ar_file_header.ar_member_name,
artimestr,
- memberp->ar_object_size,
- memberp->ar_file_header.ar_uid,
- memberp->ar_file_header.ar_gid,
- memberp->ar_file_header.ar_file_mode);
+ minfo->ar_object_size,
+ minfo->ar_file_header.ar_uid,
+ minfo->ar_file_header.ar_gid,
+ minfo->ar_file_header.ar_file_mode);
}
static int pe_ar_list_members_yaml(
diff --git a/src/arbits/output/pe_ar_print_members.c b/src/arbits/output/pe_ar_print_members.c
new file mode 100644
index 0000000..3bdf539
--- /dev/null
+++ b/src/arbits/output/pe_ar_print_members.c
@@ -0,0 +1,181 @@
+/***************************************************************/
+/* perk: PE Resource Kit */
+/* Copyright (C) 2015--2025 SysDeer Technologies, LLC */
+/* Released under GPLv2 and GPLv3; see COPYING.PERK. */
+/***************************************************************/
+
+#include <perk/perk.h>
+#include <perk/perk_output.h>
+#include "perk_driver_impl.h"
+#include "perk_dprintf_impl.h"
+#include "perk_errinfo_impl.h"
+#include "perk_ar_impl.h"
+
+static void pe_ar_member_not_found(
+ const struct pe_archive_meta * meta,
+ const char * name)
+{
+ const struct pe_driver_ctx * dctx;
+ int fderr;
+
+ dctx = (pe_archive_meta_ictx(meta))->dctx;
+
+ if ((fderr = pe_driver_fderr(dctx)) >= 0)
+ pe_dprintf(
+ fderr,
+ "%s: error: member '%s' was not found in the current archive\n",
+ dctx->program,name);
+}
+
+static struct ar_meta_member_info * pe_ar_get_member_info(
+ const struct pe_archive_meta * meta,
+ const char * name)
+{
+ struct ar_meta_member_info ** memberp;
+ const char * slash;
+
+ if ((slash = strrchr(name,'/')))
+ name = ++slash;
+
+ for (memberp=meta->a_memberv; *memberp; memberp++)
+ if (!strcmp(memberp[0]->ar_file_header.ar_member_name,name))
+ return *memberp;
+
+ pe_ar_member_not_found(meta,name);
+
+ return 0;
+}
+
+static int pe_ar_print_one_member_posix(
+ int fdout,
+ const struct pe_driver_ctx * dctx,
+ struct ar_meta_member_info * minfo)
+{
+ ssize_t ret;
+ size_t cnt;
+ const char * ch;
+
+ ret = 0;
+ cnt = minfo->ar_file_header.ar_file_size;
+ ch = minfo->ar_object_data;
+
+ for (; cnt && ret>=0; ) {
+ ch += ret;
+ cnt -= ret;
+
+ ret = write(fdout,ch,cnt);
+
+ while ((ret < 0) && (errno == EINTR))
+ ret = write(fdout,ch,cnt);
+ }
+
+ if (ret < 0)
+ return PERK_SYSTEM_ERROR(dctx);
+
+ return 0;
+}
+
+static int pe_ar_print_one_member_posix_verbose(
+ int fdout,
+ const struct pe_driver_ctx * dctx,
+ struct ar_meta_member_info * minfo,
+ const char * aname)
+{
+ const char * name = aname ? aname : minfo->ar_file_header.ar_member_name;
+
+ if (pe_dprintf(fdout,"\n<%s>\n\n",name) < 0)
+ return PERK_SYSTEM_ERROR(dctx);
+
+ if (pe_ar_print_one_member_posix(fdout,dctx,minfo) < 0)
+ return PERK_NESTED_ERROR(dctx);
+
+ return 0;
+}
+
+static int pe_ar_print_members_posix(
+ const struct pe_driver_ctx * dctx,
+ const struct pe_archive_meta * meta,
+ const struct pe_fd_ctx * fdctx,
+ const char ** members)
+{
+ struct ar_meta_member_info ** memberp;
+ struct ar_meta_member_info * minfo;
+ const char ** pname;
+ int fdout;
+ bool fname;
+
+ fdout = fdctx->fdout;
+ fname = dctx->cctx->fmtflags & PERK_PRETTY_VERBOSE;
+
+ for (pname=members; pname && *pname; pname++) {
+ if ((minfo = pe_ar_get_member_info(meta,*pname))) {
+ switch (minfo->ar_member_attr) {
+ case AR_MEMBER_ATTR_ARMAP:
+ case AR_MEMBER_ATTR_LINKINFO:
+ case AR_MEMBER_ATTR_NAMESTRS:
+ break;
+
+ default:
+ if (fname) {
+ if (pe_ar_print_one_member_posix_verbose(
+ fdout,dctx,minfo,*pname) < 0)
+ return PERK_NESTED_ERROR(dctx);
+ } else {
+ if (pe_ar_print_one_member_posix(
+ fdout,dctx,minfo) < 0)
+ return PERK_NESTED_ERROR(dctx);
+ }
+ }
+ }
+ }
+
+ for (memberp=meta->a_memberv; !members && *memberp; memberp++) {
+ switch ((*memberp)->ar_member_attr) {
+ case AR_MEMBER_ATTR_ARMAP:
+ case AR_MEMBER_ATTR_LINKINFO:
+ case AR_MEMBER_ATTR_NAMESTRS:
+ break;
+
+ default:
+ if (fname) {
+ if (pe_ar_print_one_member_posix_verbose(
+ fdout,dctx,*memberp,0) < 0)
+ return PERK_NESTED_ERROR(dctx);
+ } else {
+ if (pe_ar_print_one_member_posix(
+ fdout,dctx,*memberp) < 0)
+ return PERK_NESTED_ERROR(dctx);
+ }
+ }
+ }
+
+ return 0;
+}
+
+int pe_ar_print_members(const struct pe_archive_meta * meta, const char ** members)
+{
+ const struct pe_driver_ctx * dctx;
+ struct pe_fd_ctx fdctx;
+
+ const char ** pmember;
+
+ dctx = (pe_archive_meta_ictx(meta))->dctx;
+
+ if (pe_lib_get_driver_fdctx(dctx,&fdctx) < 0)
+ return PERK_NESTED_ERROR(dctx);
+
+ if (members && !members[0])
+ members = 0;
+
+ if (!meta->a_memberv) {
+ for (pmember=members; pmember && *pmember; pmember++)
+ pe_ar_member_not_found(meta,*pmember);
+
+ return members ? 1 : 0;
+ }
+
+ if (pe_ar_print_members_posix(dctx,meta,&fdctx,members) < 0)
+ return PERK_NESTED_ERROR(dctx);
+
+ return 0;
+}
diff --git a/src/cmds/pe_cmd_ar.c b/src/cmds/pe_cmd_ar.c
index 4b4f284..97e94c7 100644
--- a/src/cmds/pe_cmd_ar.c
+++ b/src/cmds/pe_cmd_ar.c
@@ -9,12 +9,50 @@
#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_perform_unit_actions(
+ const struct pe_driver_ctx * dctx,
+ const char * arname,
+ const char ** members,
+ uint64_t action)
+{
+ struct pe_unit_ctx * arctx = 0;
+ int (*pe_ar_fn)(const struct pe_archive_meta *,const char **);
+
+ if (action == PERK_DRIVER_AR_LIST_MEMBERS) {
+ pe_ar_fn = pe_ar_list_members;
+
+ } else if (action == PERK_DRIVER_AR_PRINT_MEMBERS) {
+ pe_ar_fn = pe_ar_print_members;
+
+ } else {
+ return 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_fn(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 +62,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) {
@@ -36,7 +74,7 @@ static int pe_cmd_ar_verify_cmdline(
case PERK_DRIVER_AR_DELETE_MEMBERS:
case PERK_DRIVER_AR_APPEND_MEMBERS:
case PERK_DRIVER_AR_EXTRACT_MEMBERS:
- case PERK_DRIVER_AR_PRINT_ARCHIVE:
+ case PERK_DRIVER_AR_PRINT_MEMBERS:
if (poscmd || posname)
return PERK_CUSTOM_ERROR(dctx,
PERK_ERR_AR_INVALID_ANCHORS);
@@ -82,9 +120,14 @@ 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)
+ uint64_t action = (flags & AR_ACTION_MASK);
+
+ if (pe_cmd_ar_verify_cmdline(dctx,flags,posname,arname,members) < 0)
+ return PERK_NESTED_ERROR(dctx);
+
+ if (pe_cmd_ar_perform_unit_actions(dctx,arname,members,action) < 0)
return PERK_NESTED_ERROR(dctx);
return 0;
diff --git a/src/driver/pe_amain.c b/src/driver/pe_amain.c
index 02e3a0a..a766dba 100644
--- a/src/driver/pe_amain.c
+++ b/src/driver/pe_amain.c
@@ -15,8 +15,6 @@
#ifndef PERK_DRIVER_FLAGS
#define PERK_DRIVER_FLAGS PERK_DRIVER_VERBOSITY_ERRORS \
| PERK_DRIVER_VERBOSITY_UTILITY \
- | PERK_DRIVER_AR_STRICT_PE \
- | PERK_DRIVER_AR_STRICT_PE_ARCH \
| PERK_DRIVER_AR_OBJECT_VECTOR
#endif
diff --git a/src/driver/pe_driver_ctx.c b/src/driver/pe_driver_ctx.c
index af9a30d..11c2e27 100644
--- a/src/driver/pe_driver_ctx.c
+++ b/src/driver/pe_driver_ctx.c
@@ -301,6 +301,15 @@ 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;
+
+ case TAG_AR_PRINT_MEMBERS:
+ cctx->drvflags |= PERK_DRIVER_AR_PRINT_MEMBERS;
+ break;
}
} else {
(*nunits)++;
diff --git a/src/internal/perk_ar_impl.h b/src/internal/perk_ar_impl.h
index b7c2fbc..0da7559 100644
--- a/src/internal/perk_ar_impl.h
+++ b/src/internal/perk_ar_impl.h
@@ -34,7 +34,7 @@
|PERK_DRIVER_AR_APPEND_MEMBERS \
|PERK_DRIVER_AR_REPLACE_MEMBERS \
|PERK_DRIVER_AR_EXTRACT_MEMBERS \
- |PERK_DRIVER_AR_PRINT_ARCHIVE)
+ |PERK_DRIVER_AR_PRINT_MEMBERS)
extern const struct argv_option pe_ar_options[];
diff --git a/src/internal/perk_driver_impl.h b/src/internal/perk_driver_impl.h
index 569d2d2..22e7894 100644
--- a/src/internal/perk_driver_impl.h
+++ b/src/internal/perk_driver_impl.h
@@ -32,6 +32,8 @@ enum app_tags {
TAG_DSOLIBS,
TAG_DSOSYMS,
TAG_HDRDUMP,
+ TAG_AR_LIST_MEMBERS,
+ TAG_AR_PRINT_MEMBERS,
};
struct pe_driver_ctx_impl {
diff --git a/src/internal/perk_synopsis_impl.h b/src/internal/perk_synopsis_impl.h
index 4f6959b..f3d0a3a 100644
--- a/src/internal/perk_synopsis_impl.h
+++ b/src/internal/perk_synopsis_impl.h
@@ -22,22 +22,22 @@
" %s [option] ... <file> ...\n\n" \
"Options:\n"
-#define PERK_AR_CMD_SYNOPSIS \
+#define PERK_AR_CMD_SYNOPSIS \
"%s — the PE/COFF Resource Kit Archiver\n\n" \
- "Synopsis:\n" \
+ "Synopsis:\n" \
" %s -d [-v] <archive> <file> ...\n" \
" %s -p [-v] [-s] <archive> <file> ...\n" \
" %s -q [-v] [-c] <archive> <file> ...\n" \
" %s -r [-v] [-c] [-u] <archive> <file> ...\n" \
" %s -t [-v] [-s] <archive> [<file> ...]\n" \
" %s -x [-v] [-s] [-C] [-T] <archive> [<file> ...]\n\n" \
- \
- " %s -m [-v] <archive> <file> ...\n" \
+ \
+ " %s -m [-v] <archive> <file> ...\n" \
" %s -m -a [-v] <posname> <archive> <file> ...\n" \
" %s -m -b [-v] <posname> <archive> <file> ...\n" \
" %s -m -i [-v] <posname> <archive> <file> ...\n\n" \
\
- " %s -r [-v] [-c] [-u] <archive> <file> ...\n" \
+ " %s -r [-v] [-c] [-u] <archive> <file> ...\n" \
" %s -r -a [-v] [-c] [-u] <posname> <archive> <file> ...\n" \
" %s -r -b [-v] [-c] [-u] <posname> <archive> <file> ...\n" \
" %s -r -i [-v] [-c] [-u] <posname> <archive> <file> ...\n\n" \
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..4bdce0e 100644
--- a/src/skin/pe_skin_ar.c
+++ b/src/skin/pe_skin_ar.c
@@ -11,5 +11,25 @@ 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"},
+
+ {"Wprint", 'p',TAG_AR_PRINT_MEMBERS,ARGV_OPTARG_NONE,
+ ARGV_OPTION_HYBRID_ONLY,0,0,
+ "print archive members"},
+
+ {"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}
};
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-07 05:33:32 +0000