From: Theodore Ts'o <tytso@mit.edu>
Date: Sat, 25 Jan 2003 04:11:29 +0000 (-0500)
Subject: save.c (blkid_save_cache): Use mkstemp() instead mktemp().
X-Git-Tag: E2FSPROGS-1_33-WIP-0306~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a1d6f3cc0f07070499beb7916f0c99de161eb7b;p=thirdparty%2Fe2fsprogs.git

save.c (blkid_save_cache): Use mkstemp() instead mktemp().
---

diff --git a/lib/blkid/ChangeLog b/lib/blkid/ChangeLog
index 8a00f908e..6791e9895 100644
--- a/lib/blkid/ChangeLog
+++ b/lib/blkid/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-24  Theodore Ts'o  <tytso@mit.edu>
+
+	* save.c (blkid_save_cache): Use mkstemp() instead mktemp().
+
 2002-10-04  Jordan Breeding  <jordan.breeding@attbi.com>
 
 	* Forward port to e2fsprogs 1.30
diff --git a/lib/blkid/save.c b/lib/blkid/save.c
index b55ab6585..0b3f1ae37 100644
--- a/lib/blkid/save.c
+++ b/lib/blkid/save.c
@@ -88,7 +88,7 @@ int blkid_save_cache(blkid_cache *cache, char *filename)
 	char tmp[4096] = { '\0', };
 	char *opened = NULL;
 	FILE *file = NULL;
-	int ret;
+	int fd, ret;
 
 	if (!cache)
 		return -BLKID_ERR_PARAM;
@@ -123,8 +123,9 @@ int blkid_save_cache(blkid_cache *cache, char *filename)
 		 */
 		if (ret == 0 && S_ISREG(st.st_mode)) {
 			snprintf(tmp, sizeof(tmp) - 1, "%s-XXXXXX", filename);
-			if (mktemp(tmp) == tmp && *tmp != '\0') {
-				file = fopen(tmp, "w");
+			fd = mkstemp(tmp);
+			if (fd >= 0) {
+				file = fdopen(fd, "w");
 				opened = tmp;
 			}
 		}