summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2024-01-26 19:09:28 +0000
committermidipix <writeonce@midipix.org>2024-01-26 19:09:28 +0000
commit405946b848705258f7f744fa0e61ff7f64ea73f4 (patch)
treef390dc7ea87afbe70155817b7d8864f693088962
parent1792cf0ea0a4fc856569aaa62f13dd15ab93a320 (diff)
downloadslibtool-405946b848705258f7f744fa0e61ff7f64ea73f4.tar.bz2
slibtool-405946b848705258f7f744fa0e61ff7f64ea73f4.tar.xz
struct slbt_archive_meta_impl: added internal vector to hold member offsets.
-rw-r--r--src/arbits/slbt_archive_meta.c19
-rw-r--r--src/internal/slibtool_ar_impl.h1
2 files changed, 20 insertions, 0 deletions
diff --git a/src/arbits/slbt_archive_meta.c b/src/arbits/slbt_archive_meta.c
index ba6e273..e83ee9f 100644
--- a/src/arbits/slbt_archive_meta.c
+++ b/src/arbits/slbt_archive_meta.c
@@ -45,6 +45,9 @@ static int slbt_free_archive_meta_impl(struct slbt_archive_meta_impl * meta, int
if (meta->memberv)
free(meta->memberv);
+ if (meta->offsetv)
+ free(meta->offsetv);
+
if (meta->members)
free(meta->members);
@@ -713,6 +716,10 @@ int slbt_get_archive_meta(
uint64_t namelen;
uint64_t nameoff;
uint32_t attr;
+ void * s_addr;
+ void * m_addr;
+ const char * s_ptr;
+ const char * m_ptr;
struct ar_raw_file_header * arhdr;
struct ar_raw_file_header * arlongnames;
struct ar_meta_member_info * memberp;
@@ -955,6 +962,10 @@ int slbt_get_archive_meta(
return slbt_free_archive_meta_impl(
m,SLBT_SYSTEM_ERROR(dctx,0));
+ if (!(m->offsetv = calloc(nentries+1,sizeof(*m->offsetv))))
+ return slbt_free_archive_meta_impl(
+ m,SLBT_SYSTEM_ERROR(dctx,0));
+
if (!(m->memberv = calloc(nentries+1,sizeof(*m->memberv))))
return slbt_free_archive_meta_impl(
m,SLBT_SYSTEM_ERROR(dctx,0));
@@ -963,12 +974,20 @@ int slbt_get_archive_meta(
return slbt_free_archive_meta_impl(
m,SLBT_SYSTEM_ERROR(dctx,0));
+ /* archive signature reference */
+ s_addr = archive->map_addr;
+ s_ptr = s_addr;
+
/* iterate, store meta data in library-friendly form */
for (idx=0,longnamep=m->namestrs; idx<nentries; idx++) {
arhdr = hdrinfov[idx].phdr;
attr = hdrinfov[idx].attr;
+ m_addr = arhdr;
+ m_ptr = m_addr;
+
memberp = &m->members[idx];
+ m->offsetv[idx] = m_ptr - s_ptr;
m->memberv[idx] = memberp;
memberp->ar_file_header.ar_header_attr = attr;
diff --git a/src/internal/slibtool_ar_impl.h b/src/internal/slibtool_ar_impl.h
index 70af6c5..ac4ffff 100644
--- a/src/internal/slibtool_ar_impl.h
+++ b/src/internal/slibtool_ar_impl.h
@@ -22,6 +22,7 @@ struct slbt_archive_meta_impl {
char * namestrs;
const char * symstrs;
const char ** symstrv;
+ off_t * offsetv;
struct ar_meta_member_info ** memberv;
struct ar_meta_member_info * members;
struct ar_armaps_impl armaps;