[src/netbsd-1-4]: src/usr.sbin/pkg_install/info Pull up 1.24-1.26:

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

details:   https://anonhg.NetBSD.org/src/rev/472962b52b05
branches:  netbsd-1-4
changeset: 469271:472962b52b05
user:      he <he%NetBSD.org@localhost>
date:      Sun Aug 22 18:03:34 1999 +0000

description:
Pull up 1.24-1.26:
  Allow specifying a package name without a version.
  Treat absolute paths in PLIST properly, i.e. do not allow them at all.
  Clean up URL handling.
  De-linting.  (hubertf)

diffstat:

 usr.sbin/pkg_install/info/perform.c |  58 +++++++++++++++++++++++++++---------
 1 files changed, 43 insertions(+), 15 deletions(-)

diffs (136 lines):

diff -r aee8479aac37 -r 472962b52b05 usr.sbin/pkg_install/info/perform.c
--- a/usr.sbin/pkg_install/info/perform.c       Sun Aug 22 18:00:20 1999 +0000
+++ b/usr.sbin/pkg_install/info/perform.c       Sun Aug 22 18:03:34 1999 +0000
@@ -1,11 +1,11 @@
-/*     $NetBSD: perform.c,v 1.23 1999/03/22 06:04:17 abs Exp $ */
+/*     $NetBSD: perform.c,v 1.23.2.1 1999/08/22 18:03:34 he Exp $      */
 
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static const char *rcsid = "from FreeBSD Id: perform.c,v 1.23 1997/10/13 15:03:53 jkh Exp";
 #else
-__RCSID("$NetBSD: perform.c,v 1.23 1999/03/22 06:04:17 abs Exp $");
+__RCSID("$NetBSD: perform.c,v 1.23.2.1 1999/08/22 18:03:34 he Exp $");
 #endif
 #endif
 
@@ -54,7 +54,7 @@
        char           *cp = NULL;
        int             code = 0;
 
-       if (isURL(pkg)) {
+       if (URLlength(pkg) > 0) {
                if ((cp = fileGetURL(NULL, pkg)) != NULL) {
                        strcpy(fname, cp);
                        isTMP = TRUE;
@@ -68,7 +68,7 @@
                            err(1, "fatal error during execution: getcwd");
                        }
                        len = strlen(fname);
-                       snprintf(&fname[len], FILENAME_MAX - len, "/%s", pkg);
+                       (void) snprintf(&fname[len], sizeof(fname) - len, "/%s", pkg);
                } else
                        strcpy(fname, pkg);
                cp = fname;
@@ -76,8 +76,9 @@
                if ((cp = fileFindByPath(NULL, pkg)) != NULL)
                        strncpy(fname, cp, FILENAME_MAX);
        }
+       
        if (cp) {
-               if (isURL(pkg)) {
+               if (URLlength(pkg) > 0) {
                        /* file is already unpacked by fileGetURL() */
                        strcpy(PlayPen, cp);
                } else {
@@ -99,17 +100,32 @@
                                goto bail;
                        }
                }
-       }
-       /*
-        * It's not an uninstalled package, try and find it among the
-        * installed
-        */
-       else {
+       } else {
+           /*
+            * It's not an uninstalled package, try and find it among the
+            * installed
+            */
                char           *tmp;
 
-               (void) snprintf(log_dir, sizeof(log_dir), "%s/%s", (tmp = getenv(PKG_DBDIR)) ? tmp : DEF_LOG_DIR,
+               (void) snprintf(log_dir, sizeof(log_dir), "%s/%s",
+                               (tmp = getenv(PKG_DBDIR)) ? tmp : DEF_LOG_DIR,
                        pkg);
                if (!fexists(log_dir) || !isdir(log_dir)) {
+                       {
+                           /* Check if the given package name matches something
+                            * with 'pkg-[0-9]*'
+                            */
+                           char try[FILENAME_MAX];
+                           snprintf(try, FILENAME_MAX, "%s-[0-9]*", pkg);
+                           if (findmatchingname(_pkgdb_getPKGDB_DIR(), try,
+                                                find_fn, NULL) != 0) {
+                               return 0; /* we've just appended some names to the pkgs list,
+                                          * they will be processed after this package.
+                                          */
+                           }
+                       }
+
+                       /* No match */
                        warnx("can't find package `%s' installed or in a file!", pkg);
                        return 1;
                }
@@ -139,7 +155,7 @@
        if (Flags & SHOW_INDEX) {
                char            tmp[FILENAME_MAX];
 
-               snprintf(tmp, FILENAME_MAX, "%-19s ", pkg);
+               (void) snprintf(tmp, sizeof(tmp), "%-19s ", pkg);
                show_index(tmp, COMMENT_FNAME);
        } else {
                /* Start showing the package contents */
@@ -221,11 +237,22 @@
            return !findmatchingname(dbdir, pkgspec, foundpkg, NULL);
        }
        /* simple match */
-       snprintf(buf, sizeof(buf), "%s/%s", dbdir, pkgspec);
+       (void) snprintf(buf, sizeof(buf), "%s/%s", dbdir, pkgspec);
        error = (stat(buf, &st) < 0);
        if (!error && !Quiet) {
                printf("%s\n", pkgspec);
        }
+       if (error) {
+           /* found nothing - try 'pkg-[0-9]*'
+            */
+           char try[FILENAME_MAX];
+           snprintf(try, FILENAME_MAX, "%s-[0-9]*", pkgspec);
+           if (findmatchingname(_pkgdb_getPKGDB_DIR(), try,
+                                foundpkg, NULL) != 0) {
+                error = 0;
+           }
+           
+       }
        return error;
 }
 
@@ -279,7 +306,7 @@
                                    strcmp(dp->d_name, "..")==0)
                                        continue;
 
-                               snprintf(tmp2, FILENAME_MAX, "%s/%s",
+                               (void) snprintf(tmp2, sizeof(tmp2), "%s/%s",
                                         tmp, dp->d_name);
                                if (isfile(tmp2))
                                        continue;
@@ -290,6 +317,7 @@
                }
            }
        } else {
+           /* Show info on individual pkg(s) */
            lpkg_t *lpp;
 
            while ((lpp = TAILQ_FIRST(pkgs))) {