Rewrite rpmMkTempFile() for sanity

- Actually use mkstemp() for creating the temp file and return a FD_t
  dupped from the file descriptor returned by mkstemp().
- Simplify the interface while at it.
- Change callers for the new interface.
- Yes we now require mkstemp() to work, mkstemp() is in POSIX.1-2001 and
  this is year 2008...

1 files changed, 3 insertions, 2 deletions

diff --git a/lib/psm.c b/lib/psm.c
index 3754e71fd..c91c017b1 100644
--- a/lib/psm.c
+++ b/lib/psm.c
@@ -10,7 +10,7 @@
 #include <rpm/rpmurl.h>
 #include <rpm/rpmds.h>
 #include <rpm/rpmts.h>
-#include <rpm/rpmfileutil.h>	/* rpmMkTempFile() */
+#include <rpm/rpmfileutil.h>	/* rpmMkTemp() */
 #include <rpm/rpmdb.h>		/* XXX for db_chrootDone */
 #include <rpm/rpmlog.h>
 #include <rpm/rpmstring.h>
@@ -696,7 +696,8 @@ static rpmRC runScript(rpmpsm psm, Header h, rpmTag stag,
 	const char * rootDir = rpmtsRootDir(ts);
 	FD_t fd;
 
-	if (rpmMkTempFile((!rpmtsChrootDone(ts) ? rootDir : "/"), &fn, &fd)) {
+	fd = rpmMkTemp((!rpmtsChrootDone(ts) ? rootDir : "/"), &fn);
+	if (fd == NULL || Ferror(fd)) {
 	    if (prefixes != NULL && freePrefixes) free(prefixes);
 	    return RPMRC_FAIL;
 	}