summaryrefslogtreecommitdiff
path: root/pkgtools/pkg_install
diff options
context:
space:
mode:
authorwiz <wiz>2006-04-04 06:28:22 +0000
committerwiz <wiz>2006-04-04 06:28:22 +0000
commit03b66ca99acd6e55a1950b38951a1786286e2f36 (patch)
treec4911868a5c493b97fae7b94b4dd82543e85436f /pkgtools/pkg_install
parent50e7edbc30380e96ae7edfd827c191596cda155f (diff)
downloadpkgsrc-03b66ca99acd6e55a1950b38951a1786286e2f36.tar.gz
Pull over v1.68 from src/usr.sbin:
revision 1.68 date: 2006/03/17 02:31:44; author: hubertf; state: Exp; lines: +4 -3 pkg_do(): only use cp2 if it's really set to something useful Coverity CID 1176
Diffstat (limited to 'pkgtools/pkg_install')
-rw-r--r--pkgtools/pkg_install/files/info/perform.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgtools/pkg_install/files/info/perform.c b/pkgtools/pkg_install/files/info/perform.c
index 3a390fe95ce..3987b60bb95 100644
--- a/pkgtools/pkg_install/files/info/perform.c
+++ b/pkgtools/pkg_install/files/info/perform.c
@@ -1,4 +1,4 @@
-/* $NetBSD: perform.c,v 1.26 2005/11/22 15:44:59 ben Exp $ */
+/* $NetBSD: perform.c,v 1.27 2006/04/04 06:28:22 wiz Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
@@ -14,7 +14,7 @@
#if 0
static const char *rcsid = "from FreeBSD Id: perform.c,v 1.23 1997/10/13 15:03:53 jkh Exp";
#else
-__RCSID("$NetBSD: perform.c,v 1.26 2005/11/22 15:44:59 ben Exp $");
+__RCSID("$NetBSD: perform.c,v 1.27 2006/04/04 06:28:22 wiz Exp $");
#endif
#endif
@@ -112,8 +112,9 @@ pkg_do(char *pkg)
if ((cp2 = fileGetURL(cp)) != NULL) {
strlcpy(fname, cp2, sizeof(fname));
isTMP = TRUE;
+
+ strcpy(PlayPen, cp2);
}
- strcpy(PlayPen, cp2);
} else {
/*
* Apply a crude heuristic to see how much space the package will