pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/pkg_install-renovation]: pkgsrc/pkgtools/pkg_install/files/delete Unb...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d30a26568e3f
branches:  pkg_install-renovation
changeset: 541583:d30a26568e3f
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Aug 05 19:37:48 2008 +0000

description:
Unbreak last commit.

diffstat:

 pkgtools/pkg_install/files/delete/perform.c |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (44 lines):

diff -r 97d54ff7445f -r d30a26568e3f pkgtools/pkg_install/files/delete/perform.c
--- a/pkgtools/pkg_install/files/delete/perform.c       Tue Aug 05 19:32:46 2008 +0000
+++ b/pkgtools/pkg_install/files/delete/perform.c       Tue Aug 05 19:37:48 2008 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: perform.c,v 1.23.2.6 2008/08/05 19:32:46 joerg Exp $   */
+/*     $NetBSD: perform.c,v 1.23.2.7 2008/08/05 19:37:48 joerg Exp $   */
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -11,7 +11,7 @@
 #if 0
 static const char *rcsid = "from FreeBSD Id: perform.c,v 1.15 1997/10/13 15:03:52 jkh Exp";
 #else
-__RCSID("$NetBSD: perform.c,v 1.23.2.6 2008/08/05 19:32:46 joerg Exp $");
+__RCSID("$NetBSD: perform.c,v 1.23.2.7 2008/08/05 19:37:48 joerg Exp $");
 #endif
 #endif
 
@@ -98,13 +98,15 @@
 {
        char *fname;
 
-       fname = pkgdb_pkg_file(fname, CONTENTS_NAME);
+       fname = pkgdb_pkg_file(pkg, CONTENTS_FNAME);
 
        if (!fexists(fname)) {
                cleanup(0);
                errx(2, "installed package %s has no %s file!",
                     pkg, CONTENTS_FNAME);
        }
+
+       free(fname);
 }
 
 void
@@ -464,7 +466,7 @@
                free(best_installed);
                cfile = fopen(fname, "r");
                if (!cfile) {
-                       warn("unable to open '%s' file", fname;
+                       warn("unable to open '%s' file", fname);
                        free(fname);
                        fail = 1;
                        goto fail;



Home | Main Index | Thread Index | Old Index