summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/CHANGES3
-rw-r--r--pkgtools/libnbcompat/Makefile4
-rw-r--r--pkgtools/libnbcompat/buildlink2.mk4
-rw-r--r--pkgtools/libnbcompat/files/mkdtemp.c12
4 files changed, 12 insertions, 11 deletions
diff --git a/doc/CHANGES b/doc/CHANGES
index 5b6dc32c89d..7914b6a013a 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.3230 2003/09/03 21:33:44 seb Exp $
+$NetBSD: CHANGES,v 1.3231 2003/09/04 01:51:53 jlam Exp $
Changes to the packages collection and infrastructure in 2003:
@@ -3516,3 +3516,4 @@ Changes to the packages collection and infrastructure in 2003:
Updated wxGTK to 2.4.1 [xtraeme 2003-09-03]
Updated mserv to 0.05nb1 [abs 2003-09-03]
Updated nam to 1.9 [seb 2003-09-03]
+ Updated libnbcompat to 20030828 [jlam 2003-09-03]
diff --git a/pkgtools/libnbcompat/Makefile b/pkgtools/libnbcompat/Makefile
index dddb26f162b..0c34d0f06c9 100644
--- a/pkgtools/libnbcompat/Makefile
+++ b/pkgtools/libnbcompat/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2003/09/03 16:38:36 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2003/09/04 01:51:15 jlam Exp $
#
-DISTNAME= libnbcompat-20030827
+DISTNAME= libnbcompat-20030828
CATEGORIES= pkgtools
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/pkgtools/libnbcompat/buildlink2.mk b/pkgtools/libnbcompat/buildlink2.mk
index 60557db6193..e1cbd465ecb 100644
--- a/pkgtools/libnbcompat/buildlink2.mk
+++ b/pkgtools/libnbcompat/buildlink2.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink2.mk,v 1.10 2003/09/03 16:38:37 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.11 2003/09/04 01:51:15 jlam Exp $
.if !defined(LIBNBCOMPAT_BUILDLINK2_MK)
LIBNBCOMPAT_BUILDLINK2_MK= # defined
-BUILDLINK_DEPENDS.libnbcompat?= libnbcompat>=20030827
+BUILDLINK_DEPENDS.libnbcompat?= libnbcompat>=20030828
BUILDLINK_PKGSRCDIR.libnbcompat?= ../../pkgtools/libnbcompat
BUILDLINK_DEPMETHOD.libnbcompat?= build
diff --git a/pkgtools/libnbcompat/files/mkdtemp.c b/pkgtools/libnbcompat/files/mkdtemp.c
index 24a6435b94d..90fbbea8209 100644
--- a/pkgtools/libnbcompat/files/mkdtemp.c
+++ b/pkgtools/libnbcompat/files/mkdtemp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mkdtemp.c,v 1.1 2003/09/01 15:31:18 jlam Exp $ */
+/* $NetBSD: mkdtemp.c,v 1.2 2003/09/04 01:51:16 jlam Exp $ */
/*
* Copyright (c) 1987, 1993
@@ -86,10 +86,10 @@ mkdtemp(char *path)
if (*trv == '/') {
*trv = '\0';
if (stat(path, &sbuf))
- return (0);
+ return (char *)NULL;
if (!S_ISDIR(sbuf.st_mode)) {
errno = ENOTDIR;
- return (0);
+ return (char *)NULL;
}
*trv = '/';
break;
@@ -98,14 +98,14 @@ mkdtemp(char *path)
for (;;) {
if (mkdir(path, 0700) >= 0)
- return (1);
+ return path;
if (errno != EEXIST)
- return (0);
+ return (char *)NULL;
/* tricky little algorithm for backward compatibility */
for (trv = start;;) {
if (!*trv)
- return (0);
+ return (char *)NULL;
if (*trv == 'z')
*trv++ = 'a';
else {