[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/3c8923eb8a4e
branches:  netbsd-3
changeset: 577499:3c8923eb8a4e
user:      tron <tron%NetBSD.org@localhost>
date:      Mon Nov 21 18:40:21 2005 +0000

description:
Pull up following revision(s) (requested by wiz in ticket #956):
        usr.sbin/pkg_install/lib/str.c: revision 1.57
Handle -1 return value from dewey_match.

diffstat:

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

diffs (33 lines):

diff -r 1dfb73d29e02 -r 3c8923eb8a4e usr.sbin/pkg_install/lib/str.c
--- a/usr.sbin/pkg_install/lib/str.c    Mon Nov 21 18:39:16 2005 +0000
+++ b/usr.sbin/pkg_install/lib/str.c    Mon Nov 21 18:40:21 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: str.c,v 1.50.2.6 2005/11/06 13:43:17 tron Exp $        */
+/*     $NetBSD: str.c,v 1.50.2.7 2005/11/21 18:40:21 tron Exp $        */
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -11,7 +11,7 @@
 #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.50.2.6 2005/11/06 13:43:17 tron Exp $");
+__RCSID("$NetBSD: str.c,v 1.50.2.7 2005/11/21 18:40:21 tron Exp $");
 #endif
 #endif
 
@@ -196,8 +196,13 @@
                return alternate_match(pattern, pkg);
        }
        if (strpbrk(pattern, "<>") != (char *) NULL) {
+               int ret;
+
                /* perform relational dewey match on version number */
-               return dewey_match(pattern, pkg);
+               ret = dewey_match(pattern, pkg);
+               if (ret < 0)
+                       errx(EXIT_FAILURE, "dewey_match returned error");
+               return ret;
        }
        if (strpbrk(pattern, "*?[]") != (char *) NULL) {
                /* glob match */