From c9d43a50917a3c37e9eb16a837a6cab43310cec1 Mon Sep 17 00:00:00 2001 From: Peter Valchev Date: Mon, 12 May 2003 22:03:23 +0000 Subject: 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 --- usr.sbin/pkg_install/lib/file.c | 9 ++------- 1 file 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 /* @@ -379,13 +379,8 @@ fileFindByPath(char *base, char *fname) strlcpy(tmp, base, sizeof(tmp)); 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), -- cgit v1.2.3