diff options
| author | Tim Kientzle <kientzle@FreeBSD.org> | 2009-03-20 17:11:45 +0000 |
|---|---|---|
| committer | Tim Kientzle <kientzle@FreeBSD.org> | 2009-03-20 17:11:45 +0000 |
| commit | f05da0e98091eb65ed73ecbf80dfafbdcca4a0de (patch) | |
| tree | babfc8304fba24a53e1a0ad7d47180cc24f6d3c8 /usr.bin | |
| parent | 8db04c5c8fa9494b6b2db01c592ffc1abc513a48 (diff) | |
| download | src-f05da0e98091eb65ed73ecbf80dfafbdcca4a0de.tar.gz src-f05da0e98091eb65ed73ecbf80dfafbdcca4a0de.zip | |
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
Notes
Notes:
svn path=/head/; revision=190162
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ar/ar.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/usr.bin/ar/ar.c b/usr.bin/ar/ar.c index e910e30f4ef3..35a0380e3653 100644 --- a/usr.bin/ar/ar.c +++ b/usr.bin/ar/ar.c @@ -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) { |