Source-Changes-HG archive

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

[src/netbsd-1-5]: src/usr.sbin/pkg_install/lib Pull up rev. 1.17 to 1.5 branc...



details:   https://anonhg.NetBSD.org/src/rev/ca1a7e95d15c
branches:  netbsd-1-5
changeset: 488683:ca1a7e95d15c
user:      hubertf <hubertf%NetBSD.org@localhost>
date:      Mon Jul 24 11:30:46 2000 +0000

description:
Pull up rev. 1.17 to 1.5 branch, approved by thorpej
 > handle NULL pen variable more gracefully in find_play_pen()

diffstat:

 usr.sbin/pkg_install/lib/pen.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (26 lines):

diff -r 7a71747fe913 -r ca1a7e95d15c usr.sbin/pkg_install/lib/pen.c
--- a/usr.sbin/pkg_install/lib/pen.c    Mon Jul 24 00:20:15 2000 +0000
+++ b/usr.sbin/pkg_install/lib/pen.c    Mon Jul 24 11:30:46 2000 +0000
@@ -1,11 +1,11 @@
-/*     $NetBSD: pen.c,v 1.16 1999/08/24 00:48:39 hubertf Exp $ */
+/*     $NetBSD: pen.c,v 1.16.8.1 2000/07/24 11:30:46 hubertf Exp $     */
 
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static const char *rcsid = "from FreeBSD Id: pen.c,v 1.25 1997/10/08 07:48:12 charnier Exp";
 #else
-__RCSID("$NetBSD: pen.c,v 1.16 1999/08/24 00:48:39 hubertf Exp $");
+__RCSID("$NetBSD: pen.c,v 1.16.8.1 2000/07/24 11:30:46 hubertf Exp $");
 #endif
 #endif
 
@@ -87,7 +87,7 @@
        char   *cp;
        struct stat sb;
 
-       if (pen[0] && stat(pen, &sb) != FAIL && (min_free(pen) >= sz))
+       if (pen && pen[0] && stat(pen, &sb) != FAIL && (min_free(pen) >= sz))
                return pen;
        else if ((cp = getenv("PKG_TMPDIR")) != NULL && stat(cp, &sb) != FAIL && (min_free(cp) >= sz))
                (void) snprintf(pen, pensize, "%s/instmp.XXXXXX", cp);



Home | Main Index | Thread Index | Old Index