[src/netbsd-1-5]: src/usr.sbin/pkg_install/lib Pull up revisions 1.18-1.19 (r...

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

details:   https://anonhg.NetBSD.org/src/rev/547d921f3c04
branches:  netbsd-1-5
changeset: 490926:547d921f3c04
user:      he <he%NetBSD.org@localhost>
date:      Tue Mar 20 18:12:39 2001 +0000

description:
Pull up revisions 1.18-1.19 (requested by hubertf):
  Various changes / updates:
   o various minor bugfixes and spelling fixes

diffstat:

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

diffs (37 lines):

diff -r f036b01d5205 -r 547d921f3c04 usr.sbin/pkg_install/lib/pen.c
--- a/usr.sbin/pkg_install/lib/pen.c    Tue Mar 20 18:12:06 2001 +0000
+++ b/usr.sbin/pkg_install/lib/pen.c    Tue Mar 20 18:12:39 2001 +0000
@@ -1,11 +1,11 @@
-/*     $NetBSD: pen.c,v 1.16.8.1 2000/07/24 11:30:46 hubertf Exp $     */
+/*     $NetBSD: pen.c,v 1.16.8.2 2001/03/20 18:12:39 he 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.8.1 2000/07/24 11:30:46 hubertf Exp $");
+__RCSID("$NetBSD: pen.c,v 1.16.8.2 2001/03/20 18:12:39 he Exp $");
 #endif
 #endif
 
@@ -97,7 +97,7 @@
                strcpy(pen, "/var/tmp/instmp.XXXXXX");
        else if (stat("/tmp", &sb) != FAIL && min_free("/tmp") >= sz)
                strcpy(pen, "/tmp/instmp.XXXXXX");
-       else if ((stat("/usr/tmp", &sb) == SUCCESS || mkdir("/usr/tmp", 01777) == SUCCESS) && min_free("/usr/tmp") >= sz)
+       else if (stat("/usr/tmp", &sb) != FAIL && min_free("/usr/tmp") >= sz)
                strcpy(pen, "/usr/tmp/instmp.XXXXXX");
        else {
                cleanup(0);
@@ -139,7 +139,9 @@
 #endif
        if (Verbose) {
                if (sz)
-                       fprintf(stderr, "Requested space: %lu bytes, free space: %qd bytes in %s\n", (u_long) sz, (long long) min_free(pen), pen);
+                       fprintf(stderr,
+               "Requested space: %lu bytes, free space: %lld bytes in %s\n",
+                           (u_long) sz, (long long) min_free(pen), pen);
        }
        if (min_free(pen) < sz) {
                rmdir(pen);