commit 7450b93f9784d4df625f9729a20a61a3d8923854
author Elliott Hughes <enh@google.com> Mon Feb 03 20:00:47 2020 -0800
committer Rob Landley <rob@landley.net> Mon Feb 03 23:47:41 2020 -0600
tree da37f5b54e4a902c421698685fd88bd50feaed7a
parent 7bf827d37a246a533d93dac8e17a7450c6267354

readelf: support large ELF64 files on LP32 systems.

toys/pending/readelf.c

diff --git a/toys/pending/readelf.c b/toys/pending/readelf.c
index a955426..acb1ed0 100644
--- a/toys/pending/readelf.c
+++ b/toys/pending/readelf.c
@@ -43,14 +43,14 @@
 // Section header.
 struct sh {
   int type, link, info;
-  long flags, addr, offset, size, addralign, entsize;
+  long long flags, addr, offset, size, addralign, entsize;
   char *name;
 };
 
 // Program header.
 struct ph {
   int type, flags;
-  long offset, vaddr, paddr, filesz, memsz, align;
+  long long offset, vaddr, paddr, filesz, memsz, align;
 };
 
 static void get_sh(int i, struct sh *s)
@@ -396,7 +396,7 @@
       char sh_flags[12] = {}, *p = sh_flags;
 
       for (j=0; j<12; j++) if (s.flags&(1<<j)) *p++="WAXxMSILOTC"[j];
-      printf("  [%2d] %-20s %-14s %0*lx %06lx %06lx %02lx %3s %2d %2d %2ld\n",
+      printf("  [%2d] %-20s %-14s %0*llx %06llx %06llx %02llx %3s %2d %2d %2lld\n",
              i, s.name, sh_type(s.type), w, s.addr, s.offset, s.size,
              s.entsize, sh_flags, s.link, s.info, s.addralign);
     }
@@ -423,7 +423,7 @@
              "Offset", w, "VirtAddr", w, "PhysAddr", "FileSiz", "MemSiz");
       for (i=0; i<phnum; i++) {
         get_ph(i, &ph);
-        printf("  %-14s 0x%06lx 0x%0*lx 0x%0*lx 0x%05lx 0x%05lx %c%c%c %#lx\n",
+        printf("  %-14s 0x%06llx 0x%0*llx 0x%0*llx 0x%05llx 0x%05llx %c%c%c %#llx\n",
                ph_type(ph.type), ph.offset, w, ph.vaddr, w, ph.paddr,
                ph.filesz, ph.memsz, ph.flags&4?'R':' ', ph.flags&2?'W':' ',
                ph.flags&1?'E':' ', ph.align);
@@ -456,7 +456,7 @@
 
     xputc('\n');
     if (!dynamic.size) printf("There is no dynamic section in this file.\n");
-    else printf("Dynamic section at offset 0x%lx contains %ld entries:\n"
+    else printf("Dynamic section at offset 0x%llx contains %lld entries:\n"
                 "  %-*s %-20s %s\n",
                 dynamic.offset, dynamic.size/dynamic.entsize,
                 w+2, "Tag", "Type", "Name/Value");
@@ -517,7 +517,7 @@
       get_ph(i, &ph);
       if (ph.type == 4 /*PT_NOTE*/) {
         printf("\n"
-          "Displaying notes found at file offset 0x%lx with length 0x%lx:\n",
+          "Displaying notes found at file offset 0x%llx with length 0x%llx:\n",
           ph.offset, ph.filesz);
         show_notes(ph.offset, ph.filesz);
       }