From owner-p4-projects@FreeBSD.ORG Fri May 14 19:24:22 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4BCB31065674; Fri, 14 May 2010 19:24:22 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 106711065672 for ; Fri, 14 May 2010 19:24:22 +0000 (UTC) (envelope-from jona@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F28C98FC18 for ; Fri, 14 May 2010 19:24:21 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4EJOL9C050892 for ; Fri, 14 May 2010 19:24:21 GMT (envelope-from jona@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4EJOLwJ050890 for perforce@freebsd.org; Fri, 14 May 2010 19:24:21 GMT (envelope-from jona@FreeBSD.org) Date: Fri, 14 May 2010 19:24:21 GMT Message-Id: <201005141924.o4EJOLwJ050890@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jona@FreeBSD.org using -f From: Jonathan Anderson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 178262 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 May 2010 19:24:22 -0000 http://p4web.freebsd.org/@@178262?ac=10 Change 178262 by jona@jona-belle-freebsd8 on 2010/05/14 19:24:03 Only set *relative_name if relative_name != NULL Affected files ... .. //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_fdlist.c#14 edit .. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld.h#8 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_fdlist.c#14 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_fdlist.c#13 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_fdlist.c#14 $ */ #include @@ -402,7 +402,8 @@ /* try to find the file itself in the FD list */ size_t len = strlen(filename); - *relative_name = filename + len; + if (relative_name) + *relative_name = filename + len; while (fd == -1) { ==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld.h#8 (text+ko) ==== @@ -226,6 +226,7 @@ struct link_map linkmap; /* For GDB and dlinfo() */ Objlist dldags; /* Object belongs to these dlopened DAGs (%) */ Objlist dagmembers; /* DAG has these members (%) */ + int fd; /* Object's file descriptor */ dev_t dev; /* Object's filesystem's device */ ino_t ino; /* Object's inode number */ void *priv; /* Platform-dependant */