[Midnightbsd-cvs] src [9057] trunk/cddl/contrib/opensolaris/tools/ctf/cvt/input.c: save basename for ctfmerge

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Oct 1 06:06:16 EDT 2016


Revision: 9057
          http://svnweb.midnightbsd.org/src/?rev=9057
Author:   laffer1
Date:     2016-10-01 06:06:16 -0400 (Sat, 01 Oct 2016)
Log Message:
-----------
save basename for ctfmerge

Modified Paths:
--------------
    trunk/cddl/contrib/opensolaris/tools/ctf/cvt/input.c

Modified: trunk/cddl/contrib/opensolaris/tools/ctf/cvt/input.c
===================================================================
--- trunk/cddl/contrib/opensolaris/tools/ctf/cvt/input.c	2016-10-01 10:05:22 UTC (rev 9056)
+++ trunk/cddl/contrib/opensolaris/tools/ctf/cvt/input.c	2016-10-01 10:06:16 UTC (rev 9057)
@@ -387,6 +387,7 @@
 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 @@
 		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)



More information about the Midnightbsd-cvs mailing list