From owner-svn-src-all@FreeBSD.ORG  Fri Mar 20 17:11:45 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
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 C20BA10656CE;
	Fri, 20 Mar 2009 17:11:45 +0000 (UTC)
	(envelope-from kientzle@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id AA4108FC19;
	Fri, 20 Mar 2009 17:11:45 +0000 (UTC)
	(envelope-from kientzle@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2KHBjhh008453;
	Fri, 20 Mar 2009 17:11:45 GMT
	(envelope-from kientzle@svn.freebsd.org)
Received: (from kientzle@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2KHBjh4008452;
	Fri, 20 Mar 2009 17:11:45 GMT
	(envelope-from kientzle@svn.freebsd.org)
Message-Id: <200903201711.n2KHBjh4008452@svn.freebsd.org>
From: Tim Kientzle <kientzle@FreeBSD.org>
Date: Fri, 20 Mar 2009 17:11:45 +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: r190162 - head/usr.bin/ar
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 &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Mar 2009 17:11:47 -0000

Author: kientzle
Date: Fri Mar 20 17:11:45 2009
New Revision: 190162
URL: http://svn.freebsd.org/changeset/base/190162

Log:
  Act like ranlib if our name ends in ranlib.  In particular,
  this works with some recent cross-building changes by Warner
  that install ranlib as, e.g., "arm-freebsd7.1-ranlib".
  
  Submitted by:	John Hein

Modified:
  head/usr.bin/ar/ar.c

Modified: head/usr.bin/ar/ar.c
==============================================================================
--- head/usr.bin/ar/ar.c	Fri Mar 20 17:10:50 2009	(r190161)
+++ head/usr.bin/ar/ar.c	Fri Mar 20 17:11:45 2009	(r190162)
@@ -108,8 +108,11 @@ main(int argc, char **argv)
 	if ((bsdar->progname = getprogname()) == NULL)
 		bsdar->progname = "ar";
 
-	if (strcmp(bsdar->progname, "ranlib") == 0 ||
-	    strcmp(bsdar->progname, "bsdranlib") == 0) {
+	/* Act like ranlib if our name ends in "ranlib"; this
+	 * accomodates arm-freebsd7.1-ranlib, bsdranlib, etc. */
+	len = strlen(bsdar->progname);
+	if (len >= strlen("ranlib") &&
+	    strcmp(bsdar->progname + len - strlen("ranlib"), "ranlib") == 0) {
 		while ((opt = getopt_long(argc, argv, "tV", longopts,
 		    NULL)) != -1) {
 			switch(opt) {