From owner-p4-projects@FreeBSD.ORG  Mon Aug 14 20:35:58 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7F5D016A4DE; Mon, 14 Aug 2006 20:35:58 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 5237C16A4DA
	for <perforce@freebsd.org>; Mon, 14 Aug 2006 20:35:58 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D152843D5D
	for <perforce@freebsd.org>; Mon, 14 Aug 2006 20:35:54 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7EKZsvg026765
	for <perforce@freebsd.org>; Mon, 14 Aug 2006 20:35:54 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7EKZsAJ026762
	for perforce@freebsd.org; Mon, 14 Aug 2006 20:35:54 GMT
	(envelope-from jb@freebsd.org)
Date: Mon, 14 Aug 2006 20:35:54 GMT
Message-Id: <200608142035.k7EKZsAJ026762@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 103901 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 14 Aug 2006 20:35:58 -0000

http://perforce.freebsd.org/chv.cgi?CH=103901

Change 103901 by jb@jb_freebsd2 on 2006/08/14 20:35:44

	Implement libelf_ehdr()

Affected files ...

.. //depot/projects/dtrace/src/lib/libelf/gelf_getehdr.c#2 edit

Differences ...

==== //depot/projects/dtrace/src/lib/libelf/gelf_getehdr.c#2 (text+ko) ====

@@ -28,12 +28,46 @@
 __FBSDID("$FreeBSD$");
 
 #include <assert.h>
+#include <errno.h>
 #include <gelf.h>
 #include <libelf.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include "_libelf.h"
 
+void *
+libelf_ehdr(Elf *e, int elfclass, int allocate)
+{
+	size_t s;
+	void *eh;
+
+	if (elfclass != e->e_class) {
+		LIBELF_SET_ERROR(CLASS, elfclass);
+		return (NULL);
+	}
+
+	if ((s = _libelf_msize(ELF_T_EHDR, elfclass, EV_CURRENT)) == 0)
+		return (NULL);
+
+	if (allocate) {
+		if ((eh = malloc(s)) == NULL) {
+			LIBELF_SET_ERROR(RESOURCE, errno);
+			return (NULL);
+		}
+		if (elfclass == ELFCLASS32)
+			memcpy(eh, &e->e_eh32, s);
+		else
+			memcpy(eh, &e->e_eh64, s);
+
+	} else if (elfclass == ELFCLASS32)
+		eh = &e->e_eh32;
+	else
+		eh = &e->e_eh64;
+
+	return (eh);
+}
+
 Elf32_Ehdr *
 elf32_getehdr(Elf *e)
 {