From owner-svn-src-all@FreeBSD.ORG Sat May 5 16:37:15 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 514DF106564A; Sat, 5 May 2012 16:37:15 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3CB6B8FC24; Sat, 5 May 2012 16:37:15 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q45GbF7O066079; Sat, 5 May 2012 16:37:15 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q45GbFdk066077; Sat, 5 May 2012 16:37:15 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201205051637.q45GbFdk066077@svn.freebsd.org> From: Baptiste Daroussin Date: Sat, 5 May 2012 16:37:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r235059 - head/libexec/rtld-elf X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 May 2012 16:37:15 -0000 Author: bapt Date: Sat May 5 16:37:14 2012 New Revision: 235059 URL: http://svn.freebsd.org/changeset/base/235059 Log: open the resolved path fix debug message Submitted by: John Marino Approved by: des (mentor) Modified: head/libexec/rtld-elf/libmap.c Modified: head/libexec/rtld-elf/libmap.c ============================================================================== --- head/libexec/rtld-elf/libmap.c Sat May 5 15:35:22 2012 (r235058) +++ head/libexec/rtld-elf/libmap.c Sat May 5 16:37:14 2012 (r235059) @@ -121,16 +121,16 @@ lmc_parse_file(char *path) } } - fd = open(path, O_RDONLY); + fd = open(rpath, O_RDONLY); if (fd == -1) { - dbg("lm_init: open(\"%s\") failed, %s", path, + dbg("lm_parse_file: open(\"%s\") failed, %s", rpath, rtld_strerror(errno)); free(rpath); return; } if (fstat(fd, &st) == -1) { close(fd); - dbg("lm_init: fstat(\"%s\") failed, %s", path, + dbg("lm_parse_file: fstat(\"%s\") failed, %s", rpath, rtld_strerror(errno)); free(rpath); return; @@ -138,7 +138,7 @@ lmc_parse_file(char *path) lm_map = mmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0); if (lm_map == (const char *)MAP_FAILED) { close(fd); - dbg("lm_init: mmap(\"%s\") failed, %s", path, + dbg("lm_parse_file: mmap(\"%s\") failed, %s", rpath, rtld_strerror(errno)); free(rpath); return;