From owner-svn-src-stable@FreeBSD.ORG Mon Nov 8 13:31:44 2010 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D1617106564A; Mon, 8 Nov 2010 13:31:44 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id BEE568FC12; Mon, 8 Nov 2010 13:31:44 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oA8DViIe033725; Mon, 8 Nov 2010 13:31:44 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oA8DViNq033723; Mon, 8 Nov 2010 13:31:44 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <201011081331.oA8DViNq033723@svn.freebsd.org> From: Rui Paulo Date: Mon, 8 Nov 2010 13:31:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r214984 - stable/8/lib/libproc X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Nov 2010 13:31:44 -0000 Author: rpaulo Date: Mon Nov 8 13:31:44 2010 New Revision: 214984 URL: http://svn.freebsd.org/changeset/base/214984 Log: Don't use basename_r(). Modified: stable/8/lib/libproc/proc_sym.c Modified: stable/8/lib/libproc/proc_sym.c ============================================================================== --- stable/8/lib/libproc/proc_sym.c Mon Nov 8 12:54:55 2010 (r214983) +++ stable/8/lib/libproc/proc_sym.c Mon Nov 8 13:31:44 2010 (r214984) @@ -109,7 +109,7 @@ proc_iter_objs(struct proc_handle *p, pr size_t i; rd_loadobj_t *rdl; prmap_t map; - char path[MAXPATHLEN]; + char *path; char last[MAXPATHLEN]; if (p->nobjs == 0) @@ -118,7 +118,7 @@ proc_iter_objs(struct proc_handle *p, pr for (i = 0; i < p->nobjs; i++) { rdl = &p->rdobjs[i]; proc_rdl2prmap(rdl, &map); - basename_r(rdl->rdl_path, path); + path = basename(rdl->rdl_path); /* * We shouldn't call the callback twice with the same object. * To do that we are assuming the fact that if there are @@ -331,7 +331,7 @@ proc_name2map(struct proc_handle *p, con size_t i; int cnt; prmap_t *map; - char tmppath[MAXPATHLEN]; + char *tmppath; struct kinfo_vmentry *kves, *kve; rd_loadobj_t *rdl; @@ -346,7 +346,7 @@ proc_name2map(struct proc_handle *p, con return (NULL); for (i = 0; i < (size_t)cnt; i++) { kve = kves + i; - basename_r(kve->kve_path, tmppath); + tmppath = basename(kve->kve_path); if (strcmp(tmppath, name) == 0) { map = proc_addr2map(p, kve->kve_start); free(kves); @@ -362,7 +362,7 @@ proc_name2map(struct proc_handle *p, con } for (i = 0; i < p->nobjs; i++) { rdl = &p->rdobjs[i]; - basename_r(rdl->rdl_path, tmppath); + tmppath = basename(rdl->rdl_path); if (strcmp(tmppath, name) == 0) { if ((map = malloc(sizeof(*map))) == NULL) return (NULL);