some fixes, cleanup and portability issues

index 4201e43..d9aee0e 100644
@@ -446,12 +446,14 @@ static void write_output(const struct logger_ctl *ctl, const char *const msg)
 
 	if (!ctl->noact) {
 		struct msghdr message = { 0 };
+#ifdef SCM_CREDENTIALS
 		struct cmsghdr *cmhp;
 		struct ucred *cred;
 		union {
 			struct cmsghdr cmh;
 			char   control[CMSG_SPACE(sizeof(struct ucred))];
 		} cbuf;
+#endif
 
 		/* 4) add extra \n to make sure message is terminated */
 		if ((ctl->socket_type == TYPE_TCP) && !ctl->octet_count)

@@ -460,6 +462,7 @@ static void write_output(const struct logger_ctl *ctl, const char *const msg)
 		message.msg_iov = iov;
 		message.msg_iovlen = iovlen;
 
+#ifdef SCM_CREDENTIALS
 		/* syslog/journald may follow local socket credentials rather
 		 * than in the message PID. If we use --id as root than we can
 		 * force kernel to accept another valid PID than the real logger(1)

@@ -479,6 +482,7 @@ static void write_output(const struct logger_ctl *ctl, const char *const msg)
 
 			cred->pid = ctl->pid;
 		}
+#endif
 
 		if (sendmsg(ctl->fd, &message, 0) < 0)
 			warn(_("send message failed"));

index 0b22983..2f95fe8 100644
@@ -276,7 +276,7 @@ static int ask_offset(struct fdisk_context *cxt,
 		snprintf(prompt, sizeof(prompt), _("%s (%ju-%ju): "), q, low, high);
 
 	do {
-		uint64_t num = 0;
+		uintmax_t num = 0;
 		char sig = 0, *p;
 		int pwr = 0;
 

@@ -313,7 +313,7 @@ static int ask_offset(struct fdisk_context *cxt,
 		if (num >= low && num <= high) {
 			if (sig && pwr)
 				fdisk_ask_number_set_relative(ask, 1);
-			return fdisk_ask_number_set_result(ask, num);
+			return fdisk_ask_number_set_result(ask, (uint64_t)num);
 		}
 		fdisk_warnx(cxt, _("Value out of range."));
 	} while (1);

index f795b35..cd88df0 100644
@@ -2564,7 +2564,8 @@ static int gpt_toggle_partition_flag(
 		unsigned long flag)
 {
 	struct fdisk_gpt_label *gpt;
-	uint64_t attrs, tmp;
+	uint64_t attrs;
+	uintmax_t tmp;
 	char *bits;
 	const char *name = NULL;
 	int bit = -1, rc;

index d1dcb65..510386e 100644
@@ -1281,7 +1281,7 @@ static int initialize_printting(struct libscols_table *tb, struct libscols_buffe
 
 		scols_reset_iter(&itr, SCOLS_ITER_FORWARD);
 
-		while (rc == 0 && scols_table_next_column(tb, &itr, &cl) == 0) {
+		while (scols_table_next_column(tb, &itr, &cl) == 0) {
 			if (scols_column_is_hidden(cl))
 				continue;
 			extra_bufsz += strlen(scols_cell_get_data(&cl->header));	/* data */

index 403e9e4..ddd6e9b 100644
@@ -18,13 +18,6 @@
 #include <sys/disklabel.h>
 #endif
 
-#ifdef HAVE_SYS_DISK_H
-# ifdef HAVE_SYS_QUEUE_H
-#  include <sys/queue.h>	/* for LIST_HEAD */
-# endif
-# include <sys/disk.h>
-#endif
-
 #ifndef EBADFD
 # define EBADFD 77		/* File descriptor in bad state */
 #endif

index d9aee0e..896d1b8 100644
@@ -53,6 +53,7 @@
 #include <pwd.h>
 #include <sys/types.h>
 #include <signal.h>
+#include <sys/uio.h>
 
 #include "all-io.h"
 #include "c.h"

index 1262e35..78399b9 100644
@@ -24,7 +24,6 @@
  *	make uuidd uuidgen localstatedir=/var
  */
 #include <error.h>
-#include <libgen.h>
 #include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>

index 5877c46..0ebcc4c 100644
@@ -16,7 +16,6 @@
  */
 
 #include <errno.h>
-#include <features.h>
 #include <getopt.h>
 
 #include "c.h"

index 9e34e6b..938728a 100644
@@ -25,7 +25,6 @@
  */
 
 #include <errno.h>
-#include <features.h>
 #include <getopt.h>
 #include <sys/time.h>
 #include <unistd.h>

index 842ea50..7c748dc 100644
@@ -22,7 +22,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
-#include <libgen.h>
 #include <linux/rtc.h>
 #include <stdio.h>
 #include <stdlib.h>

index 998010a..9ef00f0 100644
@@ -58,7 +58,6 @@
 #include <unistd.h>
 #include <signal.h>
 #include <setjmp.h>
-#include <libgen.h>
 
 #ifdef HAVE_NCURSES_H
 # include <ncurses.h>

index 141b41b..56639d1 100644
@@ -62,7 +62,7 @@ static char *xgetpass(FILE *input, const char *prompt)
 
 /* Ensure memory is set to value c without compiler optimization getting
  * into way that could happen with memset(3). */
-static int memset_s(void *v, size_t sz, const int c)
+static int xmemset_s(void *v, size_t sz, const int c)
 {
 	volatile unsigned char *p = v;
 

@@ -148,7 +148,7 @@ static int allow_setgid(const struct passwd *pe, const struct group *ge)
 	if (pwd && *pwd && (xpwd = xgetpass(stdin, _("Password: ")))) {
 		char *cbuf = crypt(xpwd, pwd);
 
-		memset_s(xpwd, strlen(xpwd), 0);
+		xmemset_s(xpwd, strlen(xpwd), 0);
 		free(xpwd);
 		if (!cbuf)
 			warn(_("crypt failed"));

index dbfa8ae..38b92ef 100644
@@ -586,7 +586,7 @@ static int is_phantom(const struct last_control *ctl, struct utmp *ut)
 
 	if (ut->UL_UT_TIME < ctl->boot_time.tv_sec)
 		return 1;
-	pw = getpwnam(ut->ut_name);
+	pw = getpwnam(ut->ut_user);
 	if (!pw)
 		return 1;
 	sprintf(path, "/proc/%u/loginuid", ut->ut_pid);

index e1f11eb..c5ce188 100644
@@ -55,7 +55,6 @@
 # include <linux/major.h>
 #endif
 #include <netdb.h>
-#include <lastlog.h>
 #include <security/pam_appl.h>
 #ifdef HAVE_SECURITY_PAM_MISC_H
 # include <security/pam_misc.h>

index ba8da7f..7c5594e 100644
@@ -8,6 +8,10 @@
 
 #include "c.h"
 
+#ifndef HAVE_MKOSTEMP
+extern int mkostemp(char *template, int flags);
+#endif
+
 extern int xmkstemp(char **tmpname, const char *dir, const char *prefix);
 
 static inline FILE *xfmkstemp(char **tmpname, const char *dir, const char *prefix)

index bf8e60a..05a8c02 100644
@@ -13,6 +13,33 @@
 #include "fileutils.h"
 #include "pathnames.h"
 
+#ifndef HAVE_MKOSTEMP
+int mkostemp(char *template, int flags)
+{
+	int fd, old_flags, errno_save;
+
+	fd = mkstemp(template);
+	if (fd < 0)
+		return fd;
+
+	old_flags = fcntl(fd, F_GETFD);
+	if (old_flags < 0)
+		goto unwind;
+	if (fcntl(fd, F_SETFD, old_flags | flags) < 0)
+		goto unwind;
+
+	return fd;
+
+unwind:
+	errno_save = errno;
+	unlink(template);
+	close(fd);
+	errno = errno_save;
+
+	return -1;
+}
+#endif
+
 /* Create open temporary file in safe way.  Please notice that the
  * file permissions are -rw------- by default. */
 int xmkstemp(char **tmpname, const char *dir, const char *prefix)

index 5e8bbee..b9f447a 100644
@@ -23,6 +23,7 @@
 #endif
 
 #include "closestream.h"
+#include "fileutils.h"
 
 #include "blkidP.h"
 

index b8a47a1..f10b08e 100644
@@ -375,6 +375,7 @@ static void lock_disk(struct fsck_instance *inst)
 	if (inst->lock >= 0) {
 		int rc = -1;
 
+		if (O_CLOEXEC == 0) fcntl(inst->lock, F_SETFD, FD_CLOEXEC);
 		/* inform users that we're waiting on the lock */
 		if (verbose &&
 		    (rc = flock(inst->lock, LOCK_EX | LOCK_NB)) != 0 &&

index a57b367..66a472e 100644
@@ -378,6 +378,7 @@ main(int argc, char **argv)
 
 	if ((fd = open(argv[1], O_RDONLY|O_CLOEXEC)) < 0)
 		err(EXIT_FAILURE, "open %s failed", argv[1]);
+	if (O_CLOEXEC == 0) fcntl(fd, F_SETFD, FD_CLOEXEC);
 
 	if (blkdev_get_size(fd, &bytes) < 0)
 		err(EXIT_FAILURE, "blkdev_get_size() failed");

index bf8e60a..897e3ce 100644
@@ -35,6 +35,7 @@ int xmkstemp(char **tmpname, const char *dir, const char *prefix)
 	old_mode = umask(077);
 	fd = mkostemp(localtmp, O_RDWR|O_CREAT|O_EXCL|O_CLOEXEC);
 	umask(old_mode);
+	if (O_CLOEXEC == 0 && fd != -1) fcntl(fd, F_SETFD, FD_CLOEXEC);
 	if (fd == -1) {
 		free(localtmp);
 		localtmp = NULL;

index 54c6200..dcee458 100644
@@ -280,6 +280,8 @@ int loopcxt_get_fd(struct loopdev_cxt *lc)
 		lc->fd = open(lc->device, lc->mode | O_CLOEXEC);
 		DBG(CXT, ul_debugobj(lc, "open %s [%s]: %m", lc->device,
 				lc->flags & LOOPDEV_FL_RDWR ? "rw" : "ro"));
+		if (O_CLOEXEC == 0 && lc->fd != -1)
+			fcntl(lc->fd, F_SETFD, FD_CLOEXEC);
 	}
 	return lc->fd;
 }

@@ -1230,7 +1232,7 @@ int loopcxt_setup_device(struct loopdev_cxt *lc)
 
 	if ((file_fd = open(lc->filename, mode | O_CLOEXEC)) < 0) {
 		if (mode != O_RDONLY && (errno == EROFS || errno == EACCES))
-			file_fd = open(lc->filename, mode = O_RDONLY);
+			file_fd = open(lc->filename, (mode = O_RDONLY) | O_CLOEXEC);
 
 		if (file_fd < 0) {
 			DBG(SETUP, ul_debugobj(lc, "open backing file failed: %m"));

@@ -1238,6 +1240,7 @@ int loopcxt_setup_device(struct loopdev_cxt *lc)
 		}
 	}
 	DBG(SETUP, ul_debugobj(lc, "backing file open: OK"));
+	if (O_CLOEXEC == 0 && file_fd >= 0) fcntl(file_fd, F_SETFD, FD_CLOEXEC);
 
 	if (lc->fd != -1 && lc->mode != mode) {
 		DBG(SETUP, ul_debugobj(lc, "closing already open device (mode mismatch)"));

index ffbe097..e3c2424 100644
@@ -75,6 +75,7 @@ static int verify_tag(const char *devname, const char *name, const char *value)
 		errsv = errno;
 		goto done;
 	}
+	if (O_CLOEXEC == 0) fcntl(fd, F_SETFD, FD_CLOEXEC);
 	if (blkid_probe_set_device(pr, fd, 0, 0))
 		goto done;
 	rc = blkid_do_safeprobe(pr);

index 4efa2ba..e4c1102 100644
@@ -221,6 +221,7 @@ blkid_probe blkid_new_probe_from_filename(const char *filename)
 	fd = open(filename, O_RDONLY|O_CLOEXEC);
 	if (fd < 0)
 		return NULL;
+	if (O_CLOEXEC == 0) fcntl(fd, F_SETFD, FD_CLOEXEC);
 
 	pr = blkid_new_probe();
 	if (!pr)

@@ -1156,6 +1157,7 @@ int blkid_do_probe(blkid_probe pr)
  *  <title>wipe all filesystems or raids from the device</title>
  *   <programlisting>
  *      fd = open(devname, O_RDWR|O_CLOEXEC);
+ *      if (O_CLOEXEC == 0) fcntl(fd, F_SETFD, FD_CLOEXEC);
  *      blkid_probe_set_device(pr, fd, 0, 0);
  *
  *      blkid_probe_enable_superblocks(pr, 1);

index 41e564f..c5403fd 100644
@@ -404,6 +404,7 @@ void blkid_read_cache(blkid_cache cache)
 	 */
 	if ((fd = open(cache->bic_filename, O_RDONLY|O_CLOEXEC)) < 0)
 		return;
+	if (O_CLOEXEC == 0) fcntl(fd, F_SETFD, FD_CLOEXEC);
 	if (fstat(fd, &st) < 0)
 		goto errout;
 	if ((st.st_mtime == cache->bic_ftime) ||

index 5e8bbee..d7955f3 100644
@@ -135,6 +135,7 @@ int blkid_flush_cache(blkid_cache cache)
 			sprintf(tmp, "%s-XXXXXX", filename);
 			fd = mkostemp(tmp, O_RDWR|O_CREAT|O_EXCL|O_CLOEXEC);
 			if (fd >= 0) {
+				if (O_CLOEXEC == 0) fcntl(fd, F_SETFD, FD_CLOEXEC);
 				if (fchmod(fd, 0644) != 0)
 					DBG(SAVE, ul_debug("%s: fchmod failed", filename));
 				else if ((file = fdopen(fd, "w" UL_CLOEXECSTR)))

index 5eba947..39b104a 100644
@@ -102,6 +102,7 @@ static int probe_md_tp(blkid_probe pr,
 
                 if (fd == -1)
 			goto nothing;
+		if (O_CLOEXEC == 0) fcntl(fd, F_SETFD, FD_CLOEXEC);
 	}
 
 	memset(&md, 0, sizeof(md));

index 06f6d53..bdb6551 100644
@@ -133,6 +133,7 @@ blkid_dev blkid_verify(blkid_cache cache, blkid_dev dev)
 					dev->bid_name));
 		goto open_err;
 	}
+	if (O_CLOEXEC == 0) fcntl(fd, F_SETFD, FD_CLOEXEC);
 
 	if (blkid_probe_set_device(cache->probe, fd, 0, 0)) {
 		/* failed to read the device */

index 1f6118c..b4c796e 100644
@@ -541,6 +541,7 @@ int fdisk_assign_device(struct fdisk_context *cxt,
 	fd = open(fname, (readonly ? O_RDONLY : O_RDWR ) | O_CLOEXEC);
 	if (fd < 0)
 		return -errno;
+	if (O_CLOEXEC == 0) fcntl(fd, F_SETFD, FD_CLOEXEC);
 
 	cxt->readonly = readonly;
 	cxt->dev_fd = fd;

index 0d94329..ca218eb 100644
@@ -220,6 +220,7 @@ static int lock_simplelock(struct libmnt_lock *ml)
 		rc = -errno;
 		goto err;
 	}
+	if (O_CLOEXEC == 0) fcntl(ml->lockfile_fd, F_SETFD, FD_CLOEXEC);
 
 	while (flock(ml->lockfile_fd, LOCK_EX) < 0) {
 		int errsv;

@@ -449,6 +450,7 @@ static int lock_mtab(struct libmnt_lock *ml)
 				rc = -errsv;
 			goto failed;
 		}
+		if (O_CLOEXEC == 0) fcntl(ml->lockfile_fd, F_SETFD, FD_CLOEXEC);
 
 		flock.l_type = F_WRLCK;
 		flock.l_whence = SEEK_SET;

index 9bc7ea3..b274c6c 100644
@@ -458,6 +458,7 @@ static int kernel_monitor_get_fd(struct libmnt_monitor *mn,
 	me->fd = open(me->path, O_RDONLY|O_CLOEXEC);
 	if (me->fd < 0)
 		goto err;
+	if (O_CLOEXEC == 0) fcntl(me->fd, F_SETFD, FD_CLOEXEC);
 
 	return me->fd;
 err:

index 4c47390..b3219cb 100644
@@ -741,6 +741,7 @@ static int __mnt_table_parse_dir(struct libmnt_table *tb, const char *dirname)
 	dd = open(dirname, O_RDONLY|O_CLOEXEC|O_DIRECTORY);
 	if (dd < 0)
 	        return -errno;
+	if (O_CLOEXEC == 0) fcntl(dd, F_SETFD, FD_CLOEXEC);
 
 	n = scandirat(dd, ".", &namelist, mnt_table_parse_dir_filter, versionsort);
 	if (n <= 0) {

@@ -759,6 +760,7 @@ static int __mnt_table_parse_dir(struct libmnt_table *tb, const char *dirname)
 
 		f = fopen_at(dd, ".", d->d_name, O_RDONLY|O_CLOEXEC, "r" UL_CLOEXECSTR);
 		if (f) {
+			if (O_CLOEXEC == 0) fcntl(fileno(f), F_SETFD, FD_CLOEXEC);
 			mnt_table_parse_stream(tb, f, d->d_name);
 			fclose(f);
 		}

@@ -800,6 +802,7 @@ static int __mnt_table_parse_dir(struct libmnt_table *tb, const char *dirname)
 		f = fopen_at(dirfd(dir), _PATH_MNTTAB_DIR, d->d_name,
 				O_RDONLY|O_CLOEXEC, "r" UL_CLOEXECSTR);
 		if (f) {
+			if (O_CLOEXEC == 0) fcntl(fileno(f), F_SETFD, FD_CLOEXEC);
 			mnt_table_parse_stream(tb, f, d->d_name);
 			fclose(f);
 		}

index 39f6c85..98820fd 100644
@@ -943,6 +943,7 @@ int mnt_open_uniq_filename(const char *filename, char **name)
 		fd = -errno;
 	umask(oldmode);
 
+	if (O_CLOEXEC == 0 && fd >= 0) fcntl(fd, F_SETFD, FD_CLOEXEC);
 	if (fd >= 0 && name)
 		*name = n;
 	else

index 7f41f9e..1e262c6 100644
@@ -94,6 +94,7 @@ static int add_line_from_stat(struct libscols_table *tb,
 		else
 			fd = open(name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC);
 		if (fd >= 0) {
+			if (O_CLOEXEC == 0) fcntl(fd, F_SETFD, FD_CLOEXEC);
 			rc = add_children(tb, ln, fd);
 			close(fd);
 		}

index 4d60997..c8c1e18 100644
@@ -236,6 +236,7 @@ static int get_clock(uint32_t *clock_high, uint32_t *clock_low,
 		state_fd = open(LIBUUID_CLOCK_FILE, O_RDWR|O_CREAT|O_CLOEXEC, 0660);
 		(void) umask(save_umask);
 		if (state_fd != -1) {
+			if (O_CLOEXEC == 0) fcntl(state_fd, F_SETFD, FD_CLOEXEC);
 			state_f = fdopen(state_fd, "r+" UL_CLOEXECSTR);
 			if (!state_f) {
 				close(state_fd);

index 1b05b38..36c2f58 100644
@@ -476,6 +476,7 @@ static int detect_consoles_from_cmdline(struct list_head *consoles)
 			continue;
 		}
 		free(name);
+		if (O_CLOEXEC == 0) fcntl(fd, F_SETFD, FD_CLOEXEC);
 #ifdef TIOCGDEV
 		if (ioctl (fd, TIOCGDEV, &devnum) < 0) {
 			close(fd);

@@ -537,6 +538,8 @@ static int detect_consoles_from_tiocgdev(struct list_head *consoles,
 
 	if (fd < 0)
 		goto done;
+	/* XXX dup() clears close-on-exec */
+	/*if (O_CLOEXEC == 0) */fcntl(fd, F_SETFD, FD_CLOEXEC);
 	if (ioctl (fd, TIOCGDEV, &devnum) < 0)
 		goto done;
 

@@ -620,6 +623,8 @@ int detect_consoles(const char *device, int fallback, struct list_head *consoles
 		close(fd);
 		goto fallback;
 #endif
+		/* XXX dup() clears close-on-exec */
+		/*if (O_CLOEXEC == 0) */fcntl(fd, F_SETFD, FD_CLOEXEC);
 		DBG(dbgprint("trying device/fallback file descriptor"));
 
 		if (fstat(fd, &st) < 0) {

index 4ecbb5d..a4f05df 100644
@@ -489,6 +489,7 @@ static int lowprobe_device(blkid_probe pr, const char *devname,
 		fprintf(stderr, "error: %s: %m\n", devname);
 		return BLKID_EXIT_NOTFOUND;
 	}
+	if (O_CLOEXEC == 0) fcntl(fd, F_SETFD, FD_CLOEXEC);
 	if (blkid_probe_set_device(pr, fd, offset, size))
 		goto done;
 

index 842ea50..a89220c 100644
@@ -374,6 +374,7 @@ static int open_dev_rtc(const char *devname)
 	fd = open(devpath, O_RDONLY | O_CLOEXEC);
 	if (fd < 0)
 		err(EXIT_FAILURE, _("%s: unable to find device"), devpath);
+	if (O_CLOEXEC == 0) fcntl(fd, F_SETFD, FD_CLOEXEC);
 	free(devpath);
 	return fd;
 }

index 095d8ed..e09f031 100644
@@ -313,6 +313,7 @@ static int set_watchdog(struct wdinfo *wd, int timeout)
 	sigprocmask(SIG_BLOCK, &sigs, &oldsigs);
 
 	fd = open(wd->device, O_WRONLY|O_CLOEXEC);
+	/* Static_assert(O_CLOEXEC != 0); */
 
 	if (fd < 0) {
 		if (errno == EBUSY)

@@ -369,6 +370,7 @@ static int read_watchdog(struct wdinfo *wd)
 	sigprocmask(SIG_BLOCK, &sigs, &oldsigs);
 
 	fd = open(wd->device, O_WRONLY|O_CLOEXEC);
+	/* Static_assert(O_CLOEXEC != 0); */
 
 	if (fd < 0) {
 		if (errno == EBUSY)

index cd57c67..812875a 100644
@@ -1623,6 +1623,8 @@ static int wait_for_term_input(int fd)
 					O_CREAT|O_CLOEXEC|O_RDONLY,
 					S_IRUSR|S_IWUSR);
 
+		/* Static_assert(O_CLOEXEC != 0); */
+
 		/* initialize reload trigger inotify stuff */
 		if (reload_fd >= 0) {
 			inotify_fd = inotify_init1(IN_NONBLOCK | IN_CLOEXEC);

@@ -2623,6 +2625,7 @@ static void reload_agettys(void)
 #ifdef AGETTY_RELOAD
 	int fd = open(AGETTY_RELOAD_FILENAME, O_CREAT|O_CLOEXEC|O_WRONLY,
 					      S_IRUSR|S_IWUSR);
+	/* Static_assert(O_CLOEXEC != 0); */
 	if (fd < 0)
 		err(EXIT_FAILURE, _("cannot open %s"), AGETTY_RELOAD_FILENAME);
 

index ba8da7f..79dd012 100644
@@ -8,6 +8,8 @@
 
 #include "c.h"
 
+extern int mkstemp_cloexec(char *template);
+
 extern int xmkstemp(char **tmpname, const char *dir, const char *prefix);
 
 static inline FILE *xfmkstemp(char **tmpname, const char *dir, const char *prefix)

index bf8e60a..15cc925 100644
@@ -13,6 +13,35 @@
 #include "fileutils.h"
 #include "pathnames.h"
 
+int mkstemp_cloexec(char *template)
+{
+#ifdef HAVE_MKOSTEMP
+	return mkostemp(template, O_RDWR|O_CREAT|O_EXCL|O_CLOEXEC);
+#else
+	int fd, old_flags, errno_save;
+
+	fd = mkstemp(template);
+	if (fd < 0)
+		return fd;
+
+	old_flags = fcntl(fd, F_GETFD, 0);
+	if (old_flags < 0)
+		goto unwind;
+	if (fcntl(fd, F_SETFD, old_flags | O_CLOEXEC) < 0)
+		goto unwind;
+
+	return fd;
+
+unwind:
+	errno_save = errno;
+	unlink(template);
+	close(fd);
+	errno = errno_save;
+
+	return -1;
+#endif
+}
+
 /* Create open temporary file in safe way.  Please notice that the
  * file permissions are -rw------- by default. */
 int xmkstemp(char **tmpname, const char *dir, const char *prefix)

@@ -33,7 +62,7 @@ int xmkstemp(char **tmpname, const char *dir, const char *prefix)
 		return -1;
 
 	old_mode = umask(077);
-	fd = mkostemp(localtmp, O_RDWR|O_CREAT|O_EXCL|O_CLOEXEC);
+	fd = mkstemp_cloexec(localtmp);
 	umask(old_mode);
 	if (fd == -1) {
 		free(localtmp);

index 5e8bbee..3070530 100644
@@ -23,6 +23,7 @@
 #endif
 
 #include "closestream.h"
+#include "fileutils.h"
 
 #include "blkidP.h"
 

@@ -133,7 +134,7 @@ int blkid_flush_cache(blkid_cache cache)
 		tmp = malloc(strlen(filename) + 8);
 		if (tmp) {
 			sprintf(tmp, "%s-XXXXXX", filename);
-			fd = mkostemp(tmp, O_RDWR|O_CREAT|O_EXCL|O_CLOEXEC);
+			fd = mkstemp_cloexec(tmp);
 			if (fd >= 0) {
 				if (fchmod(fd, 0644) != 0)
 					DBG(SAVE, ul_debug("%s: fchmod failed", filename));

index 2a8de2f..f9babba 100644
@@ -27,6 +27,7 @@
 
 #include "c.h"
 #include "mbsalign.h"
+#include "strutils.h"
 #include "widechar.h"
 
 #ifdef HAVE_WIDECHAR