Object file injection, first part

[centaur.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 6fc5bc0d4c314bcf00a336d346cdc0abd5c774a8..2c6268c6cd9e5a56ae0f1aba511fa60a59f9e219 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -2,8 +2,8 @@
 #include <stdlib.h>
 
 #include <getopt.h>
-#include <libelf.h>
-#include <gelf.h>
+#include <libelf/libelf.h>
+#include <libelf/gelf.h>
 
 #include <libelfu/libelfu.h>
 
@@ -39,7 +39,7 @@ int main(int argc, char **argv)
 
 
   /* Now that we have a (hopefully) sane environment, execute commands.
-   * Printing will ahve to be reimplemented based on the memory model.
+   * Printing will have to be reimplemented based on the memory model.
    */
   if (opts.printHeader) {
     printHeader(hIn.e);
@@ -76,11 +76,33 @@ int main(int argc, char **argv)
     }
 
     if (opts.insertBeforeSz) {
-      elfu_mInsertBefore(me, opts.insertBeforeOffs, opts.insertBeforeSz);
+      elfu_mInsertSpaceBefore(me, opts.insertBeforeOffs, opts.insertBeforeSz);
     }
 
     if (opts.insertAfterSz) {
-      elfu_mInsertAfter(me, opts.insertAfterOffs, opts.insertAfterSz);
+      elfu_mInsertSpaceAfter(me, opts.insertAfterOffs, opts.insertAfterSz);
+    }
+
+    if (opts.fnReladd) {
+      ELFHandles hRel = { 0 };
+      ElfuElf *mrel = NULL;
+
+      openElf(&hRel, opts.fnReladd, ELF_C_READ);
+      if (!hRel.e) {
+        printf("--reladd: Failed to open file for --reladd, skipping operation.\n");
+      } else {
+        mrel = elfu_mFromElf(hRel.e);
+        closeElf(&hRel);
+        if (!me) {
+          printf("--reladd: Failed to load model for --reladd, skipping operation.\n");
+        } else {
+          printf("--reladd: Model successfully loaded.\n");
+          elfu_mCheck(mrel);
+          printf("--reladd: Input model checked.\n");
+          elfu_mReladd(me, mrel);
+        }
+      }
+
     }
 
     elfu_mCheck(me);