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) {
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
