[src/netbsd-1-5]: src/usr.sbin/pkg_install/create Pull up revisions 1.23, 1.25...

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

details:   https://anonhg.NetBSD.org/src/rev/da152de02625
branches:  netbsd-1-5
changeset: 490913:da152de02625
user:      he <he%NetBSD.org@localhost>
date:      Tue Mar 20 18:00:37 2001 +0000

description:
Pull up revisions 1.23,1.25 (requested by hubertf):
  Various changes / updates:
   o plug file descriptor leak
   o various minor bugfixes and spelling fixes

diffstat:

 usr.sbin/pkg_install/create/perform.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (35 lines):

diff -r c6c9d59a27c0 -r da152de02625 usr.sbin/pkg_install/create/perform.c
--- a/usr.sbin/pkg_install/create/perform.c     Tue Mar 20 17:59:44 2001 +0000
+++ b/usr.sbin/pkg_install/create/perform.c     Tue Mar 20 18:00:37 2001 +0000
@@ -1,11 +1,11 @@
-/*     $NetBSD: perform.c,v 1.22.4.1 2000/12/15 04:06:32 he Exp $      */
+/*     $NetBSD: perform.c,v 1.22.4.2 2001/03/20 18:00:37 he Exp $      */
 
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static const char *rcsid = "from FreeBSD Id: perform.c,v 1.38 1997/10/13 15:03:51 jkh Exp";
 #else
-__RCSID("$NetBSD: perform.c,v 1.22.4.1 2000/12/15 04:06:32 he Exp $");
+__RCSID("$NetBSD: perform.c,v 1.22.4.2 2001/03/20 18:00:37 he Exp $");
 #endif
 #endif
 
@@ -34,7 +34,6 @@
 
 #include <err.h>
 #include <signal.h>
-#include <sys/syslimits.h>
 #include <sys/wait.h>
 #include <unistd.h>
 
@@ -276,6 +275,9 @@
        /* Slurp in the packing list */
        read_plist(&plist, pkg_in);
 
+       if (pkg_in != stdin)
+               fclose(pkg_in);
+
        /* Prefix should override the packing list */
        if (Prefix) {
                delete_plist(&plist, FALSE, PLIST_CWD, NULL);