From owner-svn-src-stable@FreeBSD.ORG  Fri Mar  6 22:35:02 2015
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 0A2E6C85;
 Fri,  6 Mar 2015 22:35:02 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E91EDDA6;
 Fri,  6 Mar 2015 22:35:01 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t26MZ12g023605;
 Fri, 6 Mar 2015 22:35:01 GMT (envelope-from jkim@FreeBSD.org)
Received: (from jkim@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t26MZ1WQ023604;
 Fri, 6 Mar 2015 22:35:01 GMT (envelope-from jkim@FreeBSD.org)
Message-Id: <201503062235.t26MZ1WQ023604@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: jkim set sender to jkim@FreeBSD.org
 using -f
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Fri, 6 Mar 2015 22:35:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r279715 - stable/8/libexec/rtld-elf
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Mar 2015 22:35:02 -0000

Author: jkim
Date: Fri Mar  6 22:35:01 2015
New Revision: 279715
URL: https://svnweb.freebsd.org/changeset/base/279715

Log:
  MFC:	r279364
  
  Use realpath(3) to properly expand $ORIGIN to its absolute path.

Modified:
  stable/8/libexec/rtld-elf/rtld.c
Directory Properties:
  stable/8/libexec/rtld-elf/   (props changed)

Modified: stable/8/libexec/rtld-elf/rtld.c
==============================================================================
--- stable/8/libexec/rtld-elf/rtld.c	Fri Mar  6 22:34:09 2015	(r279714)
+++ stable/8/libexec/rtld-elf/rtld.c	Fri Mar  6 22:35:01 2015	(r279715)
@@ -2563,17 +2563,16 @@ rtld_dirname(const char *path, char *bna
 static int
 rtld_dirname_abs(const char *path, char *base)
 {
-	char base_rel[PATH_MAX];
+	char *last;
 
-	if (rtld_dirname(path, base) == -1)
+	if (realpath(path, base) == NULL)
 		return (-1);
-	if (base[0] == '/')
-		return (0);
-	if (getcwd(base_rel, sizeof(base_rel)) == NULL ||
-	    strlcat(base_rel, "/", sizeof(base_rel)) >= sizeof(base_rel) ||
-	    strlcat(base_rel, base, sizeof(base_rel)) >= sizeof(base_rel))
+	dbg("%s -> %s", path, base);
+	last = strrchr(base, '/');
+	if (last == NULL)
 		return (-1);
-	strcpy(base, base_rel);
+	if (last != base)
+		*last = '\0';
 	return (0);
 }