[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install/files/lib Fix strip_txz() so it a...

[erh <erh%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/538a53caf2ad
branches:  trunk
changeset: 548346:538a53caf2ad
user:      erh <erh%pkgsrc.org@localhost>
date:      Mon Oct 13 15:54:24 2008 +0000

description:
Fix strip_txz() so it actually works even when the extension found isn't
 going to be returned.  This fixes some issues with automatic installation
 of dependencies.

diffstat:

 pkgtools/pkg_install/files/lib/str.c     |  6 +++---
 pkgtools/pkg_install/files/lib/version.h |  4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r 77822b075f7f -r 538a53caf2ad pkgtools/pkg_install/files/lib/str.c
--- a/pkgtools/pkg_install/files/lib/str.c      Mon Oct 13 15:24:44 2008 +0000
+++ b/pkgtools/pkg_install/files/lib/str.c      Mon Oct 13 15:54:24 2008 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: str.c,v 1.24 2008/04/26 17:40:01 joerg Exp $   */
+/*     $NetBSD: str.c,v 1.25 2008/10/13 15:54:24 erh 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.24 2008/04/26 17:40:01 joerg Exp $");
+__RCSID("$NetBSD: str.c,v 1.25 2008/10/13 15:54:24 erh Exp $");
 #endif
 #endif
 
@@ -140,8 +140,8 @@
                        if (suffixlen >= PKG_SUFFIX_MAX)
                                errx(EXIT_FAILURE, "too long suffix '%s'", fname);
                        memcpy(sfx, *suffixp, suffixlen+1);
-                       return;
                }
+               return;
        }
 
        /* not found */
diff -r 77822b075f7f -r 538a53caf2ad pkgtools/pkg_install/files/lib/version.h
--- a/pkgtools/pkg_install/files/lib/version.h  Mon Oct 13 15:24:44 2008 +0000
+++ b/pkgtools/pkg_install/files/lib/version.h  Mon Oct 13 15:54:24 2008 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: version.h,v 1.106 2008/10/02 20:46:56 joerg Exp $      */
+/*     $NetBSD: version.h,v 1.107 2008/10/13 15:54:24 erh Exp $        */
 
 /*
  * Copyright (c) 2001 Thomas Klausner.  All rights reserved.
@@ -27,6 +27,6 @@
 #ifndef _INST_LIB_VERSION_H_
 #define _INST_LIB_VERSION_H_
 
-#define PKGTOOLS_VERSION "20081002"
+#define PKGTOOLS_VERSION "20081013"
 
 #endif /* _INST_LIB_VERSION_H_ */