diff options
| author | Peter Valchev <pvalchev@cvs.openbsd.org> | 2003-05-12 22:03:23 +0000 |
|---|---|---|
| committer | Peter Valchev <pvalchev@cvs.openbsd.org> | 2003-05-12 22:03:23 +0000 |
| commit | c9d43a50917a3c37e9eb16a837a6cab43310cec1 (patch) | |
| tree | a08f345063af534d6037cdef88ed693fa581a377 | |
| parent | b61d1c77a11f0f3bf964cc9dccd0644e31d38eb5 (diff) | |
Fix a bug where pkg_add would fail when dependencies got a few levels deep
in the recursive install by removing the code which looks under All/ for
more packages as this is not used on OpenBSD
From Barry Scott <bscott@ridgewaysystems.com>
| -rw-r--r-- | usr.sbin/pkg_install/lib/file.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/usr.sbin/pkg_install/lib/file.c b/usr.sbin/pkg_install/lib/file.c index 1823138da60..3da4179496d 100644 --- a/usr.sbin/pkg_install/lib/file.c +++ b/usr.sbin/pkg_install/lib/file.c @@ -1,7 +1,7 @@ -/* $OpenBSD: file.c,v 1.18 2003/04/25 23:26:17 henning Exp $ */ +/* $OpenBSD: file.c,v 1.19 2003/05/12 22:03:22 pvalchev Exp $ */ #ifndef lint -static const char *rcsid = "$OpenBSD: file.c,v 1.18 2003/04/25 23:26:17 henning Exp $"; +static const char *rcsid = "$OpenBSD: file.c,v 1.19 2003/05/12 22:03:22 pvalchev Exp $"; #endif /* @@ -380,12 +380,7 @@ fileFindByPath(char *base, char *fname) cp = strrchr(tmp, '/'); if (cp) { - *cp = '\0'; /* chop name */ - cp = strrchr(tmp, '/'); - } - if (cp) { *(cp + 1) = '\0'; - strlcat(tmp, "All/", sizeof tmp); strlcat(tmp, ensure_tgz(fname), sizeof tmp); if (ispkgpattern(tmp)) { cp=findbestmatchingname(dirname_of(tmp), |