- if (dry_run) return NULL;
- if (read_only) {errno = EROFS; return NULL;}
-
- /* TODO: Replace this with a good builtin mkstemp, perhaps
- * from OpenBSD. Some glibc versions are buggy. */
- return mktemp(template);
+ RETURN_ERROR_IF(dry_run, 0);
+ RETURN_ERROR_IF(read_only, EROFS);
+
+#if defined(HAVE_SECURE_MKSTEMP) && defined(HAVE_FCHMOD)
+ {
+ int fd = mkstemp(template);
+ if (fd == -1)
+ return -1;
+ if (fchmod(fd, perms) != 0 && preserve_perms) {
+ int errno_save = errno;
+ close(fd);
+ unlink(template);
+ errno = errno_save;
+ return -1;
+ }
+ return fd;
+ }
+#else
+ if (!mktemp(template))
+ return -1;
+ return do_open(template, O_RDWR|O_EXCL|O_CREAT, perms);
+#endif