readelf: Return correct readp (or readendp) from print_form_data.

[platform/upstream/elfutils.git] / libebl / eblobjnotetypename.c

diff --git a/libebl/eblobjnotetypename.c b/libebl/eblobjnotetypename.c
index a963cef..db040d2 100644 (file)
--- a/libebl/eblobjnotetypename.c
+++ b/libebl/eblobjnotetypename.c
@@ -1,16 +1,31 @@
 /* Return note type name.
-   Copyright (C) 2002 Red Hat, Inc.
+   Copyright (C) 2002, 2007, 2009, 2011, 2016 Red Hat, Inc.
+   This file is part of elfutils.
    Written by Ulrich Drepper <drepper@redhat.com>, 2002.
 
-   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.
+   This file is free software; you can redistribute it and/or modify
+   it under the terms of either
 
-   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.   */
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at
+       your option) any later version
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at
+       your option) any later version
+
+   or both in parallel, as here.
+
+   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 copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see <http://www.gnu.org/licenses/>.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -18,24 +33,64 @@
 
 #include <inttypes.h>
 #include <stdio.h>
+#include <string.h>
 #include <libeblP.h>
 
 
 const char *
-ebl_object_note_type_name (ebl, type, buf, len)
-     Ebl *ebl;
-     uint32_t type;
-     char *buf;
-     size_t len;
+ebl_object_note_type_name (Ebl *ebl, const char *name, uint32_t type,
+                          char *buf, size_t len)
 {
-  const char *res = ebl->object_note_type_name (type, buf, len);
+  const char *res = ebl->object_note_type_name (name, type, buf, len);
 
   if (res == NULL)
     {
+      if (strcmp (name, "stapsdt") == 0)
+       {
+         snprintf (buf, len, "Version: %" PRIu32, type);
+         return buf;
+       }
+
+#define ELF_NOTE_GOPKGLIST 1
+#define ELF_NOTE_GOABIHASH 2
+#define ELF_NOTE_GODEPS    3
+#define ELF_NOTE_GOBUILDID 4
+
+      static const char *goknowntypes[] =
+       {
+#define KNOWNSTYPE(name) [ELF_NOTE_GO##name] = #name
+         KNOWNSTYPE (PKGLIST),
+         KNOWNSTYPE (ABIHASH),
+         KNOWNSTYPE (DEPS),
+         KNOWNSTYPE (BUILDID),
+#undef KNOWNSTYPE
+       };
+
+      if (strcmp (name, "Go") == 0)
+       {
+         if (type < sizeof (goknowntypes) / sizeof (goknowntypes[0])
+             && goknowntypes[type] != NULL)
+           return goknowntypes[type];
+         else
+           {
+             snprintf (buf, len, "%s: %" PRIu32, gettext ("<unknown>"), type);
+             return buf;
+           }
+       }
+
+      if (strcmp (name, "GNU") != 0)
+       {
+         snprintf (buf, len, "%s: %" PRIu32, gettext ("<unknown>"), type);
+         return buf;
+       }
+
       static const char *knowntypes[] =
        {
 #define KNOWNSTYPE(name) [NT_##name] = #name
          KNOWNSTYPE (VERSION),
+         KNOWNSTYPE (GNU_HWCAP),
+         KNOWNSTYPE (GNU_BUILD_ID),
+         KNOWNSTYPE (GNU_GOLD_VERSION),
        };
 
       /* Handle standard names.  */