From owner-svn-src-head@FreeBSD.ORG  Mon Apr  1 21:16:33 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 27EC1F96;
 Mon,  1 Apr 2013 21:16:33 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 19C701BA;
 Mon,  1 Apr 2013 21:16:33 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r31LGWdf014567;
 Mon, 1 Apr 2013 21:16:32 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r31LGWUG014566;
 Mon, 1 Apr 2013 21:16:32 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201304012116.r31LGWUG014566@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Mon, 1 Apr 2013 21:16:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r248991 - head/cddl/contrib/opensolaris/tools/ctf/cvt
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Apr 2013 21:16:33 -0000

Author: dim
Date: Mon Apr  1 21:16:32 2013
New Revision: 248991
URL: http://svnweb.freebsd.org/changeset/base/248991

Log:
  Follow up to r247960 and rr247960 by also amending ctfmerge.  For the
  only other case where STT_FILE symbols are used, in symit_next() in
  cddl/contrib/opensolaris/tools/ctf/cvt/input.c, save the basename of the
  symbol, instead of the full pathname.
  
  Reported by:	avg
  Tested by:	avg, jimharris
  MFC after:	1 week

Modified:
  head/cddl/contrib/opensolaris/tools/ctf/cvt/input.c

Modified: head/cddl/contrib/opensolaris/tools/ctf/cvt/input.c
==============================================================================
--- head/cddl/contrib/opensolaris/tools/ctf/cvt/input.c	Mon Apr  1 21:13:56 2013	(r248990)
+++ head/cddl/contrib/opensolaris/tools/ctf/cvt/input.c	Mon Apr  1 21:16:32 2013	(r248991)
@@ -387,6 +387,7 @@ GElf_Sym *
 symit_next(symit_data_t *si, int type)
 {
 	GElf_Sym sym;
+	char *bname;
 	int check_sym = (type == STT_OBJECT || type == STT_FUNC);
 
 	for (; si->si_next < si->si_nument; si->si_next++) {
@@ -394,8 +395,10 @@ symit_next(symit_data_t *si, int type)
 		gelf_getsym(si->si_symd, si->si_next, &sym);
 		si->si_curname = (caddr_t)si->si_strd->d_buf + sym.st_name;
 
-		if (GELF_ST_TYPE(sym.st_info) == STT_FILE)
-			si->si_curfile = si->si_curname;
+		if (GELF_ST_TYPE(sym.st_info) == STT_FILE) {
+			bname = strrchr(si->si_curname, '/');
+			si->si_curfile = bname == NULL ? si->si_curname : bname + 1;
+		}
 
 		if (GELF_ST_TYPE(sym.st_info) != type ||
 		    sym.st_shndx == SHN_UNDEF)