-#include <stdio.h>
#include <stdlib.h>
-#include <libelf.h>
-#include <gelf.h>
#include <libelfu/libelfu.h>
}
if (!gelf_newphdr(e, i)) {
- fprintf(stderr, "gelf_newphdr() failed: %s\n", elf_errmsg(-1));
+ ELFU_WARNELF("gelf_newphdr");
}
/* Copy PHDRs */
i = 0;
CIRCLEQ_FOREACH(mp, &me->phdrList, elem) {
if (!gelf_update_phdr (e, i, &mp->phdr)) {
- fprintf(stderr, "gelf_update_phdr() failed: %s\n", elf_errmsg(-1));
+ ELFU_WARNELF("gelf_update_phdr");
}
i++;
-static void modelToSection(ElfuScn *ms, Elf *e)
+static void* modelToSection(ElfuElf *me, ElfuScn *ms, void *aux1, void *aux2)
{
+ (void) me;
+ (void) aux2;
+ Elf *e = (Elf*)aux1;
Elf_Scn *scnOut;
scnOut = elf_newscn(e);
if (!scnOut) {
- fprintf(stderr, "elf_newscn() failed: %s\n", elf_errmsg(-1));
- return;
+ ELFU_WARNELF("elf_newscn");
+ return (void*)-1;
}
/* SHDR */
+ if (ms->linkptr) {
+ ms->shdr.sh_link = elfu_mScnIndex(me, ms->linkptr);
+ }
+ if (ms->infoptr) {
+ ms->shdr.sh_info = elfu_mScnIndex(me, ms->infoptr);
+ }
if (!gelf_update_shdr(scnOut, &ms->shdr)) {
- fprintf(stderr, "gelf_update_shdr() failed: %s\n", elf_errmsg(-1));
+ ELFU_WARNELF("gelf_update_shdr");
}
if (ms->data.d_buf) {
Elf_Data *dataOut = elf_newdata(scnOut);
if (!dataOut) {
- fprintf(stderr, "elf_newdata() failed: %s\n", elf_errmsg(-1));
+ ELFU_WARNELF("elf_newdata");
}
dataOut->d_align = ms->data.d_align;
dataOut->d_size = ms->data.d_size;
dataOut->d_version = ms->data.d_version;
}
+
+ return NULL;
}
void elfu_mToElf(ElfuElf *me, Elf *e)
{
- ElfuScn *ms;
-
/* We control the ELF file's layout now. */
- /* tired's libelf also offers ELF_F_LAYOUT_OVERLAP for overlapping sections. */
+ /* tired's libelf also offers ELF_F_LAYOUT_OVERLAP for overlapping sections,
+ * but we don't want that since we filtered it out in the reading stage
+ * already. It would be too mind-blowing to handle the dependencies between
+ * the PHDRs and sections then... */
elf_flagelf(e, ELF_C_SET, ELF_F_LAYOUT);
/* EHDR */
if (!gelf_newehdr(e, me->elfclass)) {
- fprintf(stderr, "gelf_newehdr() failed: %s\n", elf_errmsg(-1));
+ ELFU_WARNELF("gelf_newehdr");
+ }
+
+ if (me->shstrtab) {
+ me->ehdr.e_shstrndx = elfu_mScnIndex(me, me->shstrtab);
}
if (!gelf_update_ehdr(e, &me->ehdr)) {
- fprintf(stderr, "gelf_update_ehdr() failed: %s\n", elf_errmsg(-1));
+ ELFU_WARNELF("gelf_update_ehdr");
}
/* Sections */
- CIRCLEQ_FOREACH(ms, &me->scnList, elem) {
- modelToSection(ms, e);
- }
+ elfu_mScnForall(me, modelToSection, e, NULL);
/* PHDRs */