[src/netbsd-3]: src/usr.sbin/pkg_install/lib Pull up following revision(s) (r...

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

details:   https://anonhg.NetBSD.org/src/rev/1dfb73d29e02
branches:  netbsd-3
changeset: 577498:1dfb73d29e02
user:      tron <tron%NetBSD.org@localhost>
date:      Mon Nov 21 18:39:16 2005 +0000

description:
Pull up following revision(s) (requested by wiz in ticket #956):
        usr.sbin/pkg_install/lib/dewey.c: revision 1.4
Do not use errx in dewey_match, return -1 instead.

diffstat:

 usr.sbin/pkg_install/lib/dewey.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r a3906f31165f -r 1dfb73d29e02 usr.sbin/pkg_install/lib/dewey.c
--- a/usr.sbin/pkg_install/lib/dewey.c  Mon Nov 21 18:37:08 2005 +0000
+++ b/usr.sbin/pkg_install/lib/dewey.c  Mon Nov 21 18:39:16 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dewey.c,v 1.1.2.4 2005/11/10 10:46:29 tron Exp $       */
+/*     $NetBSD: dewey.c,v 1.1.2.5 2005/11/21 18:39:16 tron Exp $       */
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -227,7 +227,7 @@
 
 /*
  * Perform dewey match on "pkg" against "pattern".
- * Return 1 on match, 0 otherwise
+ * Return 1 on match, 0 on non-match, -1 on error.
  */
 int
 dewey_match(const char *pattern, const char *pkg)
@@ -242,7 +242,7 @@
                return 0;
        }
        if ((sep = strpbrk(pattern, "<>")) == NULL)
-               errx(EXIT_FAILURE, "dewey_match: '<' or '>' expected in `%s'", pattern);
+               return -1;
        /* compare name lengths */
        if ((sep-pattern != version-pkg) ||
            strncmp(pkg, pattern, (size_t)(version-pkg)) != 0)