Adjust for monotone.
diff --git a/libdwarf/dwarf_diename.c b/libdwarf/dwarf_diename.c
new file mode 100644
index 0000000..2dfcd57
--- /dev/null
+++ b/libdwarf/dwarf_diename.c
@@ -0,0 +1,139 @@
+/* Return string in name attribute of die.
+ Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
+ Written by Ulrich Drepper <drepper@redhat.com>, 2000.
+
+ This program is Open Source software; you can redistribute it and/or
+ modify it under the terms of the Open Software License version 1.0 as
+ published by the Open Source Initiative.
+
+ You should have received a copy of the Open Software License along
+ with this program; if not, you may obtain a copy of the Open Software
+ License version 1.0 from http://www.opensource.org/licenses/osl.php or
+ by writing the Open Source Initiative c/o Lawrence Rosen, Esq.,
+ 3001 King Ranch Road, Ukiah, CA 95482. */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <dwarf.h>
+#include <string.h>
+
+#include <libdwarfP.h>
+
+
+int
+dwarf_diename (die, return_name, error)
+ Dwarf_Die die;
+ char **return_name;
+ Dwarf_Error *error;
+{
+ Dwarf_Debug dbg = die->cu->dbg;
+ Dwarf_Small *die_addr;
+ Dwarf_Word u128;
+ Dwarf_Abbrev abbrev;
+ Dwarf_Small *attrp;
+
+ /* Address of the given die. */
+ die_addr = die->addr;
+
+ /* Get abbrev code. */
+ get_uleb128 (u128, die_addr);
+ /* And get the abbreviation itself. */
+ abbrev = __libdwarf_get_abbrev (dbg, die->cu, u128, error);
+ if (abbrev == NULL)
+ return DW_DLV_ERROR;
+
+ /* This is where the attributes start. */
+ attrp = abbrev->attrp;
+
+ /* Search the name attribute. */
+ while (1)
+ {
+ Dwarf_Word attr_name;
+ Dwarf_Word attr_form;
+
+ /* Are we still in bounds? */
+ if (unlikely (attrp
+ >= ((Dwarf_Small *)dbg->sections[IDX_debug_abbrev].addr
+ + dbg->sections[IDX_debug_abbrev].size)))
+ {
+ __libdwarf_error (dbg, error, DW_E_INVALID_DWARF);
+ return DW_DLV_ERROR;
+ }
+
+ /* Get attribute name and form.
+
+ XXX We don't check whether this reads beyond the end of the
+ section. */
+ get_uleb128 (attr_name, attrp);
+ get_uleb128 (attr_form, attrp);
+
+ /* We can stop if we found the attribute with value zero. */
+ if (attr_name == 0 && attr_form == 0)
+ break;
+
+ /* Is this the name attribute? */
+ if (attr_name == DW_AT_name)
+ {
+ char *str;
+
+ /* We found it. Duplicate the string and return. There are
+ two possible forms: DW_FORM_string and DW_FORM_strp. */
+ if (attr_form == DW_FORM_string)
+ {
+ str = (char *) die_addr;
+ }
+ else if (likely (attr_form == DW_FORM_strp))
+ {
+ Dwarf_Unsigned off;
+ Dwarf_Signed len;
+
+ if (die->cu->offset_size == 4)
+ off = read_4ubyte_unaligned (dbg, die_addr);
+ else
+ off = read_8ubyte_unaligned (dbg, die_addr);
+
+ /* This is an offset in the .debug_str section. Make sure
+ it's within range. */
+ if (unlikely (dwarf_get_str (dbg, off, &str, &len, error)
+ != DW_DLV_OK))
+ {
+ __libdwarf_error (dbg, error, DW_E_INVALID_DWARF);
+ return DW_DLV_ERROR;
+ }
+ }
+ else
+ {
+ __libdwarf_error (dbg, error, DW_E_INVALID_DWARF);
+ return DW_DLV_ERROR;
+ }
+
+ str = strdup (str);
+ if (str == NULL)
+ {
+ __libdwarf_error (dbg, error, DW_E_NOMEM);
+ return DW_DLV_ERROR;
+ }
+
+ *return_name = str;
+ return DW_DLV_OK;
+ }
+
+ /* Skip over the rest of this attribute (if there is any). */
+ if (attr_form != 0)
+ {
+ size_t len;
+
+ if (unlikely (__libdwarf_form_val_len (dbg, die->cu, attr_form,
+ die_addr, &len, error)
+ != DW_DLV_OK))
+ return DW_DLV_ERROR;
+
+ die_addr += len;
+ }
+ }
+
+ /* No name attribute present. */
+ return DW_DLV_NO_ENTRY;
+}