{
/* Pure evil. libelf needs some better interfaces. */
elf->kind = ELF_K_AR;
- elf->state.ar.elf_ar_hdr.ar_name = "libdwfl is faking you out";
- elf->state.ar.elf_ar_hdr.ar_size = elf->maximum_size - offset;
+ elf->state.ar.cur_ar_hdr.ar_name = "libdwfl is faking you out";
+ elf->state.ar.cur_ar_hdr.ar_size = elf->maximum_size - offset;
elf->state.ar.offset = offset - sizeof (struct ar_hdr);
Elf *subelf = elf_begin (-1, elf->cmd, elf);
elf->kind = ELF_K_NONE;
- elf->state.ar.elf_ar_hdr.ar_name = NULL;
+ elf->state.ar.cur_ar_hdr.ar_name = NULL;
if (unlikely (subelf == NULL))
error = DWFL_E_LIBELF;
else
happen on demand. */
elf->state.ar.offset = offset + SARMAG;
- elf->state.ar.elf_ar_hdr.ar_rawname = elf->state.ar.raw_name;
+ elf->state.ar.cur_ar_hdr.ar_rawname = elf->state.ar.raw_name;
}
return elf;
{
Elf_Arhdr *hdr;
- if (ref->kind == ELF_K_AR)
- hdr = &ref->state.ar.elf_ar_hdr;
- else
- hdr = &ref->state.elf.elf_ar_hdr;
+ hdr = &ref->state.ar.cur_ar_hdr;
char *ar_name = hdr->ar_name;
char *ar_rawname = hdr->ar_rawname;
/* Copy the raw name over to a NUL terminated buffer. */
*((char *) mempcpy (elf->state.ar.raw_name, ar_hdr->ar_name, 16)) = '\0';
- elf_ar_hdr = &elf->state.ar.elf_ar_hdr;
+ elf_ar_hdr = &elf->state.ar.cur_ar_hdr;
/* Now convert the `struct ar_hdr' into `Elf_Arhdr'.
Determine whether this is a special entry. */
member the internal pointer of the archive file descriptor is
pointing to. First read the header of the next member if this
has not happened already. */
- if (ref->state.ar.elf_ar_hdr.ar_name == NULL
+ if (ref->state.ar.cur_ar_hdr.ar_name == NULL
&& __libelf_next_arhdr_wrlock (ref) != 0)
/* Something went wrong. Maybe there is no member left. */
return NULL;
size_t max_size = ref->maximum_size;
size_t offset = (size_t) (ref->state.ar.offset - ref->start_offset);
size_t hdr_size = sizeof (struct ar_hdr);
- size_t ar_size = (size_t) ref->state.ar.elf_ar_hdr.ar_size;
+ size_t ar_size = (size_t) ref->state.ar.cur_ar_hdr.ar_size;
if (max_size < hdr_size || max_size - hdr_size < offset)
return NULL;
{
/* Enlist this new descriptor in the list of children. */
result->next = ref->state.ar.children;
- result->state.elf.elf_ar_hdr = ar_hdr;
ref->state.ar.children = result;
+
+ result->elf_ar_hdr = ar_hdr;
}
else
{
rwlock_unlock (parent->lock);
}
- if (elf->kind != ELF_K_AR)
- {
- if (elf->state.elf.elf_ar_hdr.ar_name != NULL)
- free (elf->state.elf.elf_ar_hdr.ar_name);
+ if (elf->elf_ar_hdr.ar_name != NULL)
+ free (elf->elf_ar_hdr.ar_name);
- if (elf->state.elf.elf_ar_hdr.ar_rawname != NULL)
- free (elf->state.elf.elf_ar_hdr.ar_rawname);
- }
+ if (elf->elf_ar_hdr.ar_rawname != NULL)
+ free (elf->elf_ar_hdr.ar_rawname);
/* This was the last activation. Free all resources. */
switch (elf->kind)
return NULL;
}
- return &elf->state.elf.elf_ar_hdr;
+ return &elf->elf_ar_hdr;
}
/* Now advance the offset. */
parent->state.ar.offset += (sizeof (struct ar_hdr)
- + ((parent->state.ar.elf_ar_hdr.ar_size + 1)
+ + ((parent->state.ar.cur_ar_hdr.ar_size + 1)
& ~1l));
/* Get the next archive header. */
/* If necessary, mark the archive header as unusable. */
if (ret == ELF_C_NULL)
- parent->state.ar.elf_ar_hdr.ar_name = NULL;
+ parent->state.ar.cur_ar_hdr.ar_name = NULL;
rwlock_unlock (parent->lock);
if (__libelf_next_arhdr_wrlock (elf) != 0)
{
/* Mark the archive header as unusable. */
- elf->state.ar.elf_ar_hdr.ar_name = NULL;
+ elf->elf_ar_hdr.ar_name = NULL;
return 0;
}
/* Reference counting for the descriptor. */
int ref_count;
+ /* Structure returned by 'elf_getarhdr'. */
+ Elf_Arhdr elf_ar_hdr;
+
/* Lock to handle multithreaded programs. */
rwlock_define (,lock);
read from the file. */
search_tree rawchunk_tree; /* Tree and lock for elf_getdata_rawchunk
results. */
- Elf_Arhdr elf_ar_hdr; /* Structure returned by 'elf_getarhdr'. */
unsigned int scnincr; /* Number of sections allocate the last
time. */
int ehdr_flags; /* Flags (dirty) for ELF header. */
read from the file. */
search_tree rawchunk_tree; /* Tree and lock for
elf_getdata_rawchunk results. */
- Elf_Arhdr elf_ar_hdr; /* Structure returned by 'elf_getarhdr'. */
unsigned int scnincr; /* Number of sections allocate the last
time. */
int ehdr_flags; /* Flags (dirty) for ELF header. */
read from the file. */
search_tree rawchunk_tree; /* Tree and lock for
elf_getdata_rawchunk results. */
- Elf_Arhdr elf_ar_hdr; /* Structure returned by 'elf_getarhdr'. */
unsigned int scnincr; /* Number of sections allocate the last
time. */
int ehdr_flags; /* Flags (dirty) for ELF header. */
int64_t offset; /* Offset in file we are currently at.
elf_next() advances this to the next
member of the archive. */
- Elf_Arhdr elf_ar_hdr; /* Copy of current archive member's structure
+ Elf_Arhdr cur_ar_hdr; /* Copy of current archive member's structure
returned by 'elf_getarhdr'. */
struct ar_hdr ar_hdr; /* Header read from file. */
char ar_name[16]; /* NUL terminated ar_name of elf_ar_hdr. */
/arextract
/arls
/arsymtest
+/ar-extract-ar
/asm-tst1
/asm-tst2
/asm-tst3
cu-dwp-section-info declfiles test-manyfuncs \
eu_search_cfi eu_search_macros \
eu_search_lines eu_search_die \
+ ar-extract-ar \
$(asm_TESTS)
asm_TESTS = asm-tst1 asm-tst2 asm-tst3 asm-tst4 asm-tst5 \
arextract_LDADD = $(libelf)
arsymtest_LDADD = $(libelf)
+ar_extract_ar_LDADD = $(libelf)
newfile_LDADD = $(libelf)
saridx_LDADD = $(libeu) $(libelf)
scnnames_LDADD = $(libelf)
--- /dev/null
+/* Copyright (C) 2025 Red Hat, Inc.
+ This file is part of elfutils.
+
+ This file is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ elfutils is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <assert.h>
+#include <fcntl.h>
+#include <gelf.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <system.h>
+
+#define printf_indent(n, ...) \
+ do { \
+ for (int _i = 0; _i < (n); _i++) \
+ fputs (" ", stdout); \
+ printf (__VA_ARGS__); \
+ } while (0)
+
+static void
+ar_extract (Elf *elf, int indent)
+{
+ Elf *subelf;
+ Elf_Arsym *arsym;
+ size_t narsym;
+ Elf_Cmd cmd = ELF_C_READ;
+
+ assert (elf_kind (elf) == ELF_K_AR);
+
+ arsym = elf_getarsym (elf, &narsym);
+ if (arsym == NULL)
+ {
+ printf_indent (indent, "Cannot get archive index: %s\n", elf_errmsg (-1));
+ exit (1);
+ }
+
+ if (narsym != 4)
+ {
+ printf_indent (indent, "Incorrect number of arsyms\n");
+ exit (1);
+ }
+
+ printf_indent (indent, "== symbol names ==\n");
+
+ /* Print symbol names. Skip the null entry at the end of arsyms. */
+ for (size_t i = 0; i < narsym - 1; ++i)
+ printf_indent (indent, "%s\n", arsym[i].as_name);
+ putchar ('\n');
+ printf_indent (indent, "== headers ==\n");
+
+ /* Print header names and recursively call this function on member
+ archives. */
+ while ((subelf = elf_begin (-1, cmd, elf)) != NULL)
+ {
+ /* The the header for this element. */
+ Elf_Arhdr *arhdr = elf_getarhdr (subelf);
+
+ if (arhdr == NULL)
+ {
+ printf_indent (indent, "cannot get arhdr: %s\n", elf_errmsg (-1));
+ exit (1);
+ }
+
+ printf_indent (indent, "%s %s\n", arhdr->ar_name, arhdr->ar_rawname);
+
+ if (elf_kind (subelf) == ELF_K_AR)
+ ar_extract (subelf, indent + 1);
+
+ cmd = elf_next (subelf);
+ elf_end (subelf);
+ }
+
+ putchar ('\n');
+}
+
+
+int
+main (int argc, char *argv[])
+{
+ int fd;
+ Elf *elf;
+ Elf_Cmd cmd;
+
+ if (argc < 2)
+ exit (1);
+
+ /* Open the archive. */
+ fd = open (argv[1], O_RDONLY);
+ if (fd == -1)
+ {
+ printf ("Cannot open input file: %m");
+ exit (1);
+ }
+
+ /* Set the ELF version. */
+ elf_version (EV_CURRENT);
+
+ /* Create an ELF descriptor. */
+ cmd = ELF_C_READ;
+ elf = elf_begin (fd, cmd, NULL);
+
+ if (elf == NULL)
+ {
+ printf ("Cannot create ELF descriptor: %s\n", elf_errmsg (-1));
+ exit (1);
+ }
+
+ /* If it is no archive punt. */
+ if (elf_kind (elf) != ELF_K_AR)
+ {
+ printf ("`%s' is no archive\n", argv[1]);
+ exit (1);
+ }
+
+ ar_extract (elf, 0);
+ elf_end (elf);
+ close (fd);
+
+ return 0;
+}
testrun_compare ${abs_top_builddir}/src/ar -t test.ar << EOF
EOF
+tempfiles bin* dup* long* inner* outer*
+
+echo Compile files for nested archives.
+
+cat > dup.c <<'EOF'
+int dup_func(void){return 1;}
+EOF
+cat > bin_outer.c <<'EOF'
+int outer_func(void){return 1;}
+EOF
+cat > long_name_long_name_outer.c <<'EOF'
+int long_name_long_name_func(void){return 1;}
+EOF
+cat > bin_inner1.c <<'EOF'
+int inner1_func(void){return 1;}
+EOF
+cat > long_name_long_name_inner1.c <<'EOF'
+int long_name_long_name_func(void){return 1;}
+EOF
+cat > bin_inner2.c <<'EOF'
+int inner2_func(void){return 1;}
+EOF
+cat > long_name_long_name_inner2.c <<'EOF'
+int long_name_long_name_func(void){return 1;}
+EOF
+
+# Compile the source files.
+for src in *.c; do
+ obj=$(echo "$src" | sed 's/\.c$/.o/')
+ gcc -O0 -c "$src" -o "$obj"
+done
+
+echo Create nested archives.
+testrun ${abs_top_builddir}/src/ar -r inner2.ar bin_inner2.o
+testrun ${abs_top_builddir}/src/ar -r inner2.ar dup.o
+testrun ${abs_top_builddir}/src/ar -r inner2.ar long_name_long_name_inner2.o
+
+# inner1.ar contains inner2.ar
+testrun ${abs_top_builddir}/src/ar -r inner1.ar inner2.ar
+testrun ${abs_top_builddir}/src/ar -r inner1.ar bin_inner1.o
+testrun ${abs_top_builddir}/src/ar -r inner1.ar dup.o
+testrun ${abs_top_builddir}/src/ar -r inner1.ar long_name_long_name_inner1.o
+
+# outer.ar contains inner1.ar
+testrun ${abs_top_builddir}/src/ar -r outer.ar inner1.ar
+testrun ${abs_top_builddir}/src/ar -r outer.ar bin_outer.o
+testrun ${abs_top_builddir}/src/ar -r outer.ar dup.o
+testrun ${abs_top_builddir}/src/ar -r outer.ar long_name_long_name_outer.o
+
+echo Check symbol and header names of the nested archives.
+
+testrun_compare ${abs_builddir}/ar-extract-ar outer.ar <<'EOF'
+== symbol names ==
+outer_func
+dup_func
+long_name_long_name_func
+
+== headers ==
+/ /
+// //
+inner1.ar inner1.ar/
+ == symbol names ==
+ inner1_func
+ dup_func
+ long_name_long_name_func
+
+ == headers ==
+ / /
+ // //
+ inner2.ar inner2.ar/
+ == symbol names ==
+ inner2_func
+ dup_func
+ long_name_long_name_func
+
+ == headers ==
+ / /
+ // //
+ bin_inner2.o bin_inner2.o/
+ dup.o dup.o/
+ long_name_long_name_inner2.o /0
+
+ bin_inner1.o bin_inner1.o/
+ dup.o dup.o/
+ long_name_long_name_inner1.o /0
+
+bin_outer.o bin_outer.o/
+dup.o dup.o/
+long_name_long_name_outer.o /0
+
+EOF
+
exit 0
projects / thirdparty / elfutils.git / commitdiff
