Move internal function __libdwfl_find_build_id to libdwelf and use it to
add a public dwelf_elf_gnu_build_id function to extract the NT_GNU_BUILD_ID
from an ELF file using either the shdrs or phdrs. Adjust internal callers
and add a testcase.

Signed-off-by: Mark Wielaard <[email protected]>
---
 libdw/ChangeLog                                    |   4 +
 libdw/libdw.map                                    |   1 +
 libdwelf/ChangeLog                                 |   9 ++
 libdwelf/Makefile.am                               |   6 +-
 .../dwelf_elf_gnu_build_id.c                       | 126 ++++++---------------
 libdwelf/libdwelf.h                                |   8 ++
 libdwelf/libdwelfP.h                               |   1 +
 libdwfl/ChangeLog                                  |  10 ++
 libdwfl/dwfl_module_build_id.c                     |  92 +--------------
 libdwfl/dwfl_module_getdwarf.c                     |  31 +----
 libdwfl/dwfl_segment_report_module.c               |  11 +-
 tests/ChangeLog                                    |   8 ++
 tests/Makefile.am                                  |  12 +-
 tests/buildid.c                                    |  81 +++++++++++++
 tests/run-buildid.sh                               |  38 +++++++
 tests/testfile42_noshdrs.bz2                       | Bin 0 -> 6746 bytes
 16 files changed, 222 insertions(+), 216 deletions(-)
 copy libdwfl/dwfl_module_build_id.c => libdwelf/dwelf_elf_gnu_build_id.c (60%)
 create mode 100644 tests/buildid.c
 create mode 100755 tests/run-buildid.sh
 create mode 100644 tests/testfile42_noshdrs.bz2

diff --git a/libdw/ChangeLog b/libdw/ChangeLog
index 3152239..94ef03c 100644
--- a/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@ -1,3 +1,7 @@
+2014-04-30  Mark Wielaard  <[email protected]>
+
+       * libdw.map (ELFUTILS_0.159): Add dwelf_elf_gnu_build_id.
+
 2014-04-15  Florian Weimer  <[email protected]>
 
        * dwarf_begin_elf.c (__check_build_id, try_debugaltlink)
diff --git a/libdw/libdw.map b/libdw/libdw.map
index 3529980..899e13e 100644
--- a/libdw/libdw.map
+++ b/libdw/libdw.map
@@ -299,4 +299,5 @@ ELFUTILS_0.159 {
     dwarf_setalt;
     dwelf_dwarf_gnu_debugaltlink;
     dwelf_elf_gnu_debuglink;
+    dwelf_elf_gnu_build_id;
 } ELFUTILS_0.158;
diff --git a/libdwelf/ChangeLog b/libdwelf/ChangeLog
index aa29132..9f95ea8 100644
--- a/libdwelf/ChangeLog
+++ b/libdwelf/ChangeLog
@@ -1,3 +1,12 @@
+2014-04-30  Mark Wielaard  <[email protected]>
+
+       * Makefile.am (AM_CPPFLAGS): Add libdwfl and libebl include dirs.
+       (libdwelf_a_SOURCES): Add dwelf_elf_gnu_build_id.c
+       * dwelf_elf_gnu_build_id.c: New file. Moved libdwfl function
+       __libdwfl_find_elf_build_id here.
+       * libdwelf.h (dwelf_elf_gnu_build_id): Declare new function.
+       * libdwelfP.h (dwelf_elf_gnu_build_id): Add internal declaration.
+
 2014-04-24  Florian Weimer  <[email protected]>
 
        * dwelf_dwarf_gnu_debugaltlink.c: New file.
diff --git a/libdwelf/Makefile.am b/libdwelf/Makefile.am
index 1ca3a5c..cd4b7dd 100644
--- a/libdwelf/Makefile.am
+++ b/libdwelf/Makefile.am
@@ -30,7 +30,8 @@
 ## not, see <http://www.gnu.org/licenses/>.
 ##
 include $(top_srcdir)/config/eu.am
-AM_CPPFLAGS += -I$(srcdir)/../libelf -I$(srcdir)/../libdw
+AM_CPPFLAGS += -I$(srcdir)/../libelf -I$(srcdir)/../libdw \
+              -I$(srcdir)/../libdwfl -I$(srcdir)/../libebl
 VERSION = 1
 
 noinst_LIBRARIES = libdwelf.a libdwelf_pic.a
@@ -38,7 +39,8 @@ noinst_LIBRARIES = libdwelf.a libdwelf_pic.a
 pkginclude_HEADERS = libdwelf.h
 noinst_HEADERS = libdwelfP.h
 
-libdwelf_a_SOURCES = dwelf_elf_gnu_debuglink.c dwelf_dwarf_gnu_debugaltlink.c
+libdwelf_a_SOURCES = dwelf_elf_gnu_debuglink.c dwelf_dwarf_gnu_debugaltlink.c \
+       dwelf_elf_gnu_build_id.c
 
 libdwelf = $(libdw)
 
diff --git a/libdwfl/dwfl_module_build_id.c b/libdwelf/dwelf_elf_gnu_build_id.c
similarity index 60%
copy from libdwfl/dwfl_module_build_id.c
copy to libdwelf/dwelf_elf_gnu_build_id.c
index cae007b..1ed501d 100644
--- a/libdwfl/dwfl_module_build_id.c
+++ b/libdwelf/dwelf_elf_gnu_build_id.c
@@ -1,5 +1,5 @@
-/* Return build ID information for a module.
-   Copyright (C) 2007-2010 Red Hat, Inc.
+/* Returns the build id if found in a NT_GNU_BUILD_ID note.
+   Copyright (C) 2014 Red Hat, Inc.
    This file is part of elfutils.
 
    This file is free software; you can redistribute it and/or modify
@@ -26,49 +26,22 @@
    the GNU Lesser General Public License along with this program.  If
    not, see <http://www.gnu.org/licenses/>.  */
 
-#include "libdwflP.h"
-
-static int
-found_build_id (Dwfl_Module *mod, bool set,
-               const void *bits, int len, GElf_Addr vaddr)
-{
-  if (!set)
-    /* When checking bits, we do not compare VADDR because the
-       address found in a debuginfo file may not match the main
-       file as modified by prelink.  */
-    return 1 + (mod->build_id_len == len
-               && !memcmp (bits, mod->build_id_bits, len));
-
-  void *copy = malloc (len);
-  if (unlikely (copy == NULL))
-    {
-      __libdwfl_seterrno (DWFL_E_NOMEM);
-      return -1;
-    }
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 
-  mod->build_id_bits = memcpy (copy, bits, len);
-  mod->build_id_vaddr = vaddr;
-  mod->build_id_len = len;
-  return len;
-}
+#include "libdwelfP.h"
+#include "libdwflP.h"
 
 #define NO_VADDR       ((GElf_Addr) -1l)
 
-int
-internal_function
-__libdwfl_find_elf_build_id (Dwfl_Module *mod, Elf *elf,
-                            const void **build_id_bits,
-                            GElf_Addr *build_id_elfaddr, int *build_id_len)
+/* Defined here for reuse. The dwelf interface doesn't care about the
+   address of the note, but libdwfl does.  */
+static int
+find_elf_build_id (Dwfl_Module *mod, int e_type, Elf *elf,
+                  const void **build_id_bits, GElf_Addr *build_id_elfaddr,
+                  int *build_id_len)
 {
-  GElf_Ehdr ehdr_mem, *ehdr = gelf_getehdr (elf, &ehdr_mem);
-  if (unlikely (ehdr == NULL))
-    {
-      __libdwfl_seterrno (DWFL_E_LIBELF);
-      return -1;
-    }
-  // MOD->E_TYPE is zero here.
-  assert (ehdr->e_type != ET_REL || mod != NULL);
-
   int check_notes (Elf_Data *data, GElf_Addr data_elfaddr)
   {
     size_t pos = 0;
@@ -100,7 +73,8 @@ __libdwfl_find_elf_build_id (Dwfl_Module *mod, Elf *elf,
       size_t phnum;
       if (unlikely (elf_getphdrnum (elf, &phnum) != 0))
        {
-         __libdwfl_seterrno (DWFL_E_LIBELF);
+         if (mod != NULL)
+           __libdwfl_seterrno (DWFL_E_LIBELF);
          return -1;
        }
       for (size_t i = 0; result == 0 && i < phnum; ++i)
@@ -126,7 +100,7 @@ __libdwfl_find_elf_build_id (Dwfl_Module *mod, Elf *elf,
            GElf_Addr vaddr = 0;
            if (!(shdr->sh_flags & SHF_ALLOC))
              vaddr = NO_VADDR;
-           else if (mod == NULL || ehdr->e_type != ET_REL)
+           else if (mod == NULL || e_type != ET_REL)
              vaddr = shdr->sh_addr;
            else if (__libdwfl_relocate_value (mod, elf, &shstrndx,
                                               elf_ndxscn (scn), &vaddr))
@@ -141,61 +115,33 @@ __libdwfl_find_elf_build_id (Dwfl_Module *mod, Elf *elf,
 
 int
 internal_function
-__libdwfl_find_build_id (Dwfl_Module *mod, bool set, Elf *elf)
-{
-  const void *build_id_bits;
-  GElf_Addr build_id_elfaddr;
-  int build_id_len;
-
-  int result = __libdwfl_find_elf_build_id (mod, elf, &build_id_bits,
-                                           &build_id_elfaddr, &build_id_len);
-  if (result <= 0)
-    return result;
-
-  GElf_Addr build_id_vaddr = build_id_elfaddr + (build_id_elfaddr != 0
-                                                ? mod->main_bias : 0);
-  return found_build_id (mod, set, build_id_bits, build_id_len, 
build_id_vaddr);
-}
-
-int
-dwfl_module_build_id (Dwfl_Module *mod,
-                     const unsigned char **bits, GElf_Addr *vaddr)
+__libdwfl_find_elf_build_id (Dwfl_Module *mod, Elf *elf,
+                            const void **build_id_bits,
+                            GElf_Addr *build_id_elfaddr, int *build_id_len)
 {
-  if (mod == NULL)
-    return -1;
-
-  if (mod->build_id_len == 0 && mod->main.elf != NULL)
+  GElf_Ehdr ehdr_mem, *ehdr = gelf_getehdr (elf, &ehdr_mem);
+  if (unlikely (ehdr == NULL))
     {
-      /* We have the file, but have not examined it yet.  */
-      int result = __libdwfl_find_build_id (mod, true, mod->main.elf);
-      if (result <= 0)
-       {
-         mod->build_id_len = -1;       /* Cache negative result.  */
-         return result;
-       }
+      __libdwfl_seterrno (DWFL_E_LIBELF);
+      return -1;
     }
+  // MOD->E_TYPE is zero here.
+  assert (ehdr->e_type != ET_REL || mod != NULL);
 
-  if (mod->build_id_len <= 0)
-    return 0;
-
-  *bits = mod->build_id_bits;
-  *vaddr = mod->build_id_vaddr;
-  return mod->build_id_len;
+  return find_elf_build_id (mod, ehdr->e_type, elf,
+                           build_id_bits, build_id_elfaddr, build_id_len);
 }
-INTDEF (dwfl_module_build_id)
-NEW_VERSION (dwfl_module_build_id, ELFUTILS_0.138)
 
-#ifdef SHARED
-COMPAT_VERSION (dwfl_module_build_id, ELFUTILS_0.130, vaddr_at_end)
-
-int
-_compat_vaddr_at_end_dwfl_module_build_id (Dwfl_Module *mod,
-                                          const unsigned char **bits,
-                                          GElf_Addr *vaddr)
+ssize_t
+dwelf_elf_gnu_build_id (Elf *elf, const void **build_idp)
 {
-  int result = INTUSE(dwfl_module_build_id) (mod, bits, vaddr);
+  GElf_Addr build_id_elfaddr;
+  int build_id_len;
+  int result = find_elf_build_id (NULL, ET_NONE, elf, build_idp,
+                                 &build_id_elfaddr, &build_id_len);
   if (result > 0)
-    *vaddr += (result + 3) & -4;
+    return build_id_len;
+
   return result;
 }
-#endif
+INTDEF(dwelf_elf_gnu_build_id)
diff --git a/libdwelf/libdwelf.h b/libdwelf/libdwelf.h
index 6f1dbd3..e16dc0f 100644
--- a/libdwelf/libdwelf.h
+++ b/libdwelf/libdwelf.h
@@ -57,6 +57,14 @@ extern ssize_t dwelf_dwarf_gnu_debugaltlink (Dwarf *dwarf,
                                             const char **namep,
                                             const void **build_idp);
 
+/* Returns the build ID as found in a NT_GNU_BUILD_ID note from either
+   a SHT_NOTE section or from a PT_NOTE segment if the ELF file
+   doesn't contain any section headers.  On success a pointer to the
+   build ID is written to *BUILDID_P, and the positive length of the
+   build ID is returned.  Returns 0 if the ELF lacks a NT_GNU_BUILD_ID
+   note.  Returns -1 in case of malformed data or other errors.  */
+extern ssize_t dwelf_elf_gnu_build_id (Elf *elf, const void **build_idp);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/libdwelf/libdwelfP.h b/libdwelf/libdwelfP.h
index c00a834..d83c759 100644
--- a/libdwelf/libdwelfP.h
+++ b/libdwelf/libdwelfP.h
@@ -37,5 +37,6 @@
 /* Avoid PLT entries.  */
 INTDECL (dwelf_elf_gnu_debuglink)
 INTDECL (dwelf_dwarf_gnu_debugaltlink)
+INTDECL (dwelf_elf_gnu_build_id)
 
 #endif /* libdwelfP.h */
diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog
index 62ea412..7e4234d 100644
--- a/libdwfl/ChangeLog
+++ b/libdwfl/ChangeLog
@@ -1,3 +1,13 @@
+2014-04-30  Mark Wielaard  <[email protected]>
+
+       * dwfl_module_build_id.c (__libdwfl_find_elf_build_id): Moved to
+       dwelf_elf_gnu_build_id.c.
+       (__libdwfl_find_build_id): Add assert to make sure mod is never NULL.
+       * dwfl_segment_report_module.c (dwfl_segment_report_module): Call
+       dwelf_elf_gnu_build_id directly instead of __libdwfl_find_build_id.
+       * dwfl_module_getdwarf.c (__check_build_id): Implement using
+       dwelf_elf_gnu_build_id.
+
 2014-04-15  Florian Weimer  <[email protected]>
 
        * dwfl_module_getdwarf.c (__check_build_id): Moved from libdw.
diff --git a/libdwfl/dwfl_module_build_id.c b/libdwfl/dwfl_module_build_id.c
index cae007b..350bbf8 100644
--- a/libdwfl/dwfl_module_build_id.c
+++ b/libdwfl/dwfl_module_build_id.c
@@ -1,5 +1,5 @@
 /* Return build ID information for a module.
-   Copyright (C) 2007-2010 Red Hat, Inc.
+   Copyright (C) 2007-2010, 2014 Red Hat, Inc.
    This file is part of elfutils.
 
    This file is free software; you can redistribute it and/or modify
@@ -52,93 +52,6 @@ found_build_id (Dwfl_Module *mod, bool set,
   return len;
 }
 
-#define NO_VADDR       ((GElf_Addr) -1l)
-
-int
-internal_function
-__libdwfl_find_elf_build_id (Dwfl_Module *mod, Elf *elf,
-                            const void **build_id_bits,
-                            GElf_Addr *build_id_elfaddr, int *build_id_len)
-{
-  GElf_Ehdr ehdr_mem, *ehdr = gelf_getehdr (elf, &ehdr_mem);
-  if (unlikely (ehdr == NULL))
-    {
-      __libdwfl_seterrno (DWFL_E_LIBELF);
-      return -1;
-    }
-  // MOD->E_TYPE is zero here.
-  assert (ehdr->e_type != ET_REL || mod != NULL);
-
-  int check_notes (Elf_Data *data, GElf_Addr data_elfaddr)
-  {
-    size_t pos = 0;
-    GElf_Nhdr nhdr;
-    size_t name_pos;
-    size_t desc_pos;
-    while ((pos = gelf_getnote (data, pos, &nhdr, &name_pos, &desc_pos)) > 0)
-      if (nhdr.n_type == NT_GNU_BUILD_ID
-         && nhdr.n_namesz == sizeof "GNU" && !memcmp (data->d_buf + name_pos,
-                                                      "GNU", sizeof "GNU"))
-       {
-         *build_id_bits = data->d_buf + desc_pos;
-         *build_id_elfaddr = (data_elfaddr == NO_VADDR
-                              ? 0 : data_elfaddr + desc_pos);
-         *build_id_len = nhdr.n_descsz;
-         return 1;
-       }
-    return 0;
-  }
-
-  size_t shstrndx = SHN_UNDEF;
-  int result = 0;
-
-  Elf_Scn *scn = elf_nextscn (elf, NULL);
-
-  if (scn == NULL)
-    {
-      /* No sections, have to look for phdrs.  */
-      size_t phnum;
-      if (unlikely (elf_getphdrnum (elf, &phnum) != 0))
-       {
-         __libdwfl_seterrno (DWFL_E_LIBELF);
-         return -1;
-       }
-      for (size_t i = 0; result == 0 && i < phnum; ++i)
-       {
-         GElf_Phdr phdr_mem;
-         GElf_Phdr *phdr = gelf_getphdr (elf, i, &phdr_mem);
-         if (likely (phdr != NULL) && phdr->p_type == PT_NOTE)
-           result = check_notes (elf_getdata_rawchunk (elf,
-                                                       phdr->p_offset,
-                                                       phdr->p_filesz,
-                                                       ELF_T_NHDR),
-                                 phdr->p_vaddr);
-       }
-    }
-  else
-    do
-      {
-       GElf_Shdr shdr_mem;
-       GElf_Shdr *shdr = gelf_getshdr (scn, &shdr_mem);
-       if (likely (shdr != NULL) && shdr->sh_type == SHT_NOTE)
-         {
-           /* Determine the right sh_addr in this module.  */
-           GElf_Addr vaddr = 0;
-           if (!(shdr->sh_flags & SHF_ALLOC))
-             vaddr = NO_VADDR;
-           else if (mod == NULL || ehdr->e_type != ET_REL)
-             vaddr = shdr->sh_addr;
-           else if (__libdwfl_relocate_value (mod, elf, &shstrndx,
-                                              elf_ndxscn (scn), &vaddr))
-             vaddr = NO_VADDR;
-           result = check_notes (elf_getdata (scn, NULL), vaddr);
-         }
-      }
-    while (result == 0 && (scn = elf_nextscn (elf, scn)) != NULL);
-
-  return result;
-}
-
 int
 internal_function
 __libdwfl_find_build_id (Dwfl_Module *mod, bool set, Elf *elf)
@@ -147,6 +60,9 @@ __libdwfl_find_build_id (Dwfl_Module *mod, bool set, Elf 
*elf)
   GElf_Addr build_id_elfaddr;
   int build_id_len;
 
+  /* For mod == NULL use dwelf_elf_gnu_build_id directly.  */
+  assert (mod != NULL);
+
   int result = __libdwfl_find_elf_build_id (mod, elf, &build_id_bits,
                                            &build_id_elfaddr, &build_id_len);
   if (result <= 0)
diff --git a/libdwfl/dwfl_module_getdwarf.c b/libdwfl/dwfl_module_getdwarf.c
index 6163ddb..e8087bf 100644
--- a/libdwfl/dwfl_module_getdwarf.c
+++ b/libdwfl/dwfl_module_getdwarf.c
@@ -42,34 +42,13 @@ __check_build_id (Dwarf *dw, const uint8_t *build_id, const 
size_t id_len)
     return -1;
 
   Elf *elf = dw->elf;
-  Elf_Scn *scn = elf_nextscn (elf, NULL);
-  if (scn == NULL)
+  const void *elf_build_id;
+  ssize_t elf_id_len = INTUSE(dwelf_elf_gnu_build_id) (elf, &elf_build_id);
+  if (elf_id_len < 0)
     return -1;
 
-  do
-    {
-      GElf_Shdr shdr_mem;
-      GElf_Shdr *shdr = gelf_getshdr (scn, &shdr_mem);
-      if (likely (shdr != NULL) && shdr->sh_type == SHT_NOTE)
-       {
-         size_t pos = 0;
-         GElf_Nhdr nhdr;
-         size_t name_pos;
-         size_t desc_pos;
-         Elf_Data *data = elf_getdata (scn, NULL);
-         while ((pos = gelf_getnote (data, pos, &nhdr, &name_pos,
-                                     &desc_pos)) > 0)
-           if (nhdr.n_type == NT_GNU_BUILD_ID
-               && nhdr.n_namesz == sizeof "GNU"
-               && ! memcmp (data->d_buf + name_pos, "GNU", sizeof "GNU"))
-             return (nhdr.n_descsz == id_len
-                     && ! memcmp (data->d_buf + desc_pos,
-                                  build_id, id_len)) ? 0 : 1;
-        }
-      }
-    while ((scn = elf_nextscn (elf, scn)) != NULL);
-
-  return -1;
+  return (id_len == (size_t) elf_id_len
+         && memcmp (build_id, elf_build_id, id_len) == 0) ? 0 : 1;
 }
 
 /* Try to open an debug alt link by name, checking build_id.
diff --git a/libdwfl/dwfl_segment_report_module.c 
b/libdwfl/dwfl_segment_report_module.c
index fd967e9..dfecb51 100644
--- a/libdwfl/dwfl_segment_report_module.c
+++ b/libdwfl/dwfl_segment_report_module.c
@@ -494,13 +494,12 @@ dwfl_segment_report_module (Dwfl *dwfl, int ndx, const 
char *name,
                && module->disk_file_has_build_id && build_id_len > 0)
              {
                const void *elf_build_id;
-               GElf_Addr elf_build_id_elfaddr;
-               int elf_build_id_len;
+               ssize_t elf_build_id_len;
 
-               if (__libdwfl_find_elf_build_id (NULL, module->elf,
-                                                &elf_build_id,
-                                                &elf_build_id_elfaddr,
-                                                &elf_build_id_len) > 0)
+               /* If there is a build id in the elf file, check it.  */
+               elf_build_id_len = INTUSE(dwelf_elf_gnu_build_id) (module->elf,
+                                                               &elf_build_id);
+               if (elf_build_id_len > 0)
                  {
                    if (build_id_len != (size_t) elf_build_id_len
                        || memcmp (build_id, elf_build_id, build_id_len) != 0)
diff --git a/tests/ChangeLog b/tests/ChangeLog
index 1c30778..ff396d5 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,11 @@
+2014-04-30  Mark Wielaard  <[email protected]>
+
+       * buildid.c, buildid.sh, testfile42_noshdrs.bz2: New files.
+       * Makefile.am (check_PROGRAMS): Add buildid.
+       (TESTS): Add run-buildid.sh.
+       (EXTRA_DISTS): Add run-buildid.sh and testfile42_noshdrs.bz2.
+       (buildid_LDADD): New variable.
+
 2014-04-24  Florian Weimer  <[email protected]>
 
        * allfcts.c (setup_alt): New function.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 33803fc..dd110a5 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -49,7 +49,9 @@ check_PROGRAMS = arextract arsymtest newfile saridx scnnames 
sectiondump \
                  alldts md5-sha1-test typeiter typeiter2 low_high_pc \
                  test-elf_cntl_gelf_getshdr dwflsyms dwfllines \
                  dwfl-report-elf-align varlocs backtrace backtrace-child \
-                 backtrace-data backtrace-dwarf debuglink debugaltlink
+                 backtrace-data backtrace-dwarf debuglink debugaltlink \
+                 buildid
+
 asm_TESTS = asm-tst1 asm-tst2 asm-tst3 asm-tst4 asm-tst5 \
            asm-tst6 asm-tst7 asm-tst8 asm-tst9
 
@@ -86,7 +88,7 @@ TESTS = run-arextract.sh run-arsymtest.sh newfile test-nlist \
        run-readelf-macro.sh run-readelf-loc.sh \
        run-readelf-aranges.sh run-readelf-line.sh \
        run-native-test.sh run-bug1-test.sh \
-       run-debuglink.sh run-debugaltlink.sh \
+       run-debuglink.sh run-debugaltlink.sh run-buildid.sh \
        dwfl-bug-addr-overflow run-addrname-test.sh \
        dwfl-bug-fd-leak dwfl-bug-report \
        run-dwfl-bug-offline-rel.sh run-dwfl-addr-sect.sh \
@@ -176,14 +178,15 @@ EXTRA_DIST = run-arextract.sh run-arsymtest.sh \
             run-readelf-test1.sh run-readelf-test2.sh run-readelf-test3.sh \
             run-readelf-test4.sh run-readelf-twofiles.sh \
             run-bug1-test.sh testfile28.bz2 testfile28.rdwr.bz2 \
-            run-debuglink.sh run-debugaltlink.sh \
+            run-debuglink.sh run-debugaltlink.sh run-buildid.sh \
             testfile29.bz2 testfile29.rdwr.bz2 \
             testfile30.bz2 testfile31.bz2 testfile32.bz2 testfile33.bz2 \
             testfile34.bz2 testfile35.bz2 testfile35.debug.bz2 \
             testfile36.bz2 testfile36.debug.bz2 \
             testfile37.bz2 testfile37.debug.bz2 \
             testfile38.bz2 testfile39.bz2 testfile40.bz2 testfile40.debug.bz2 \
-            testfile41.bz2 testfile42.bz2 testfile43.bz2 \
+            testfile41.bz2 testfile42.bz2 testfile42_noshdrs.bz2 \
+            testfile43.bz2 \
             testfile44.S.bz2 testfile44.expect.bz2 run-disasm-x86.sh \
             testfile45.S.bz2 testfile45.expect.bz2 run-disasm-x86-64.sh \
             testfile46.bz2 testfile47.bz2 testfile48.bz2 testfile48.debug.bz2 \
@@ -406,6 +409,7 @@ backtrace_dwarf_CFLAGS = -Wno-unused-parameter
 backtrace_dwarf_LDADD = $(libdw) $(libelf)
 debuglink_LDADD = $(libdw) $(libelf)
 debugaltlink_LDADD = $(libdw) $(libelf)
+buildid_LDADD = $(libdw) $(libelf)
 
 if GCOV
 check: check-am coverage
diff --git a/tests/buildid.c b/tests/buildid.c
new file mode 100644
index 0000000..87c1877
--- /dev/null
+++ b/tests/buildid.c
@@ -0,0 +1,81 @@
+/* Test program for dwelf_elf_gnu_build_id, print build ID.
+   Copyright (C) 2014 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/>.  */
+
+#include <config.h>
+#include <assert.h>
+#include <inttypes.h>
+#include <err.h>
+#include <errno.h>
+#include ELFUTILS_HEADER(elf)
+#include ELFUTILS_HEADER(dwelf)
+#include <stdio.h>
+#include <error.h>
+#include <string.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+int
+main (int argc, char *argv[])
+{
+  if (argc < 2)
+    error (EXIT_FAILURE, 0, "No input file given");
+
+  elf_version (EV_CURRENT);
+
+  for (int i = 1; i < argc; i++)
+    {
+      const char *file = argv[i];
+      int fd = open (file, O_RDONLY);
+      if (fd < 0)
+       error (EXIT_FAILURE, errno, "couldn't open file '%s'", file);
+
+      Elf *elf = elf_begin (fd, ELF_C_READ, NULL);
+      if (elf == NULL)
+       {
+         printf("%s: elf_begin failed: %s\n", file, elf_errmsg (-1));
+         close (fd);
+         continue;
+       }
+
+      const void *build_id;
+      ssize_t len = dwelf_elf_gnu_build_id (elf, &build_id);
+      switch (len)
+       {
+       case 0:
+         printf ("%s: <no NT_GNU_BUILD_ID note>\n", file);
+         break;
+       case -1:
+         errx (1, "dwelf_elf_gnu_build_id (%s): %s",
+               file, elf_errmsg (-1));
+       default:
+         printf ("%s: build ID: ", file);
+         const unsigned char *p = build_id;
+         const unsigned char *end = p + len;
+         while (p < end)
+             printf("%02x", (unsigned)*p++);
+         putchar('\n');
+       }
+
+      elf_end (elf);
+      close (fd);
+    }
+
+  return 0;
+}
diff --git a/tests/run-buildid.sh b/tests/run-buildid.sh
new file mode 100755
index 0000000..31cec24
--- /dev/null
+++ b/tests/run-buildid.sh
@@ -0,0 +1,38 @@
+#! /bin/sh
+# Copyright (C) 2014 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/>.
+
+. $srcdir/test-subr.sh
+
+# Just some random testfiles, four with, one without build-id,
+# and one without shdrs forcing reading the notes through phdrs.
+# eu-strip --strip-sections -g --output=testfile42_noshdrs testfile42
+# See also run-debugaltlink.sh.
+testfiles testfile42 testfile_multi.dwz testfile-dwzstr.multi \
+    test-offset-loop.alt testfile14 testfile42_noshdrs
+
+testrun_compare  ${abs_builddir}/buildid testfile42 testfile42_noshdrs \
+    testfile_multi.dwz testfile-dwzstr.multi \
+    test-offset-loop.alt testfile14 <<\EOF
+testfile42: build ID: d826d96c4d097bdc5c254b1f7344a907e36b0439
+testfile42_noshdrs: build ID: d826d96c4d097bdc5c254b1f7344a907e36b0439
+testfile_multi.dwz: build ID: a0d6c06e0d912d74033b6fe2808753cae8f6f594
+testfile-dwzstr.multi: build ID: 6da22627dae55c1d62cf9122827c665e240a056b
+test-offset-loop.alt: build ID: 066bbf1a7bc5676f5015ee1966a088f23bdb83ae
+testfile14: <no NT_GNU_BUILD_ID note>
+EOF
+
+exit 0
diff --git a/tests/testfile42_noshdrs.bz2 b/tests/testfile42_noshdrs.bz2
new file mode 100644
index 
0000000000000000000000000000000000000000..e50f750057435211f4aa4baa5172b1e3c4fcc4ea
GIT binary patch
literal 6746
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

literal 0
HcmV?d00001

-- 
1.9.0

Reply via email to