[src/netbsd-1-4]: src/usr.sbin/pkg_install/lib Pull up revisions 1.19-1.20 (r...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d7da13fa79b5
branches:  netbsd-1-4
changeset: 470239:d7da13fa79b5
user:      he <he%NetBSD.org@localhost>
date:      Mon Jan 31 21:00:05 2000 +0000

description:
Pull up revisions 1.19-1.20 (requested by hubertf):
  Implement FTP wildcard depends, to give NetBSD full wildcard support
  not only in pkgsrc but also for binary packages installed from
  local disk or via FTP.

diffstat:

 usr.sbin/pkg_install/lib/str.c |  11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diffs (39 lines):

diff -r ac8859605ab0 -r d7da13fa79b5 usr.sbin/pkg_install/lib/str.c
--- a/usr.sbin/pkg_install/lib/str.c    Mon Jan 31 20:59:47 2000 +0000
+++ b/usr.sbin/pkg_install/lib/str.c    Mon Jan 31 21:00:05 2000 +0000
@@ -1,11 +1,11 @@
-/*     $NetBSD: str.c,v 1.14.2.4 1999/12/20 15:14:29 he Exp $  */
+/*     $NetBSD: str.c,v 1.14.2.5 2000/01/31 21:00:05 he Exp $  */
 
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static const char *rcsid = "Id: str.c,v 1.5 1997/10/08 07:48:21 charnier Exp";
 #else
-__RCSID("$NetBSD: str.c,v 1.14.2.4 1999/12/20 15:14:29 he Exp $");
+__RCSID("$NetBSD: str.c,v 1.14.2.5 2000/01/31 21:00:05 he Exp $");
 #endif
 #endif
 
@@ -277,10 +277,6 @@
                        continue;
 
                (void) snprintf(tmp, sizeof(tmp), "%s/%s", dir, dp->d_name);
-#if 0 /* This code breaks a LOT ... */
-               if (isfile(tmp))/* pkgdb, ... */
-                       continue;
-#endif
                
                if (pmatch(pattern, dp->d_name)) {
                        if (match) {
@@ -306,8 +302,9 @@
 
 /*
  * Auxiliary function called by findbestmatchingname() if pkg > data
+ * Also called for FTP matching
  */
-static int
+int
 findbestmatchingname_fn(const char *pkg, char *data)
 {
        char   *s1, *s2;