ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lib: provide fallback if mkostemp(3) missing 

It's missing on OSX.

CC: Yuriy M. Kaminskiy <yumkam@gmail.com>
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
This commit is contained in:
Ruediger Meier 2016-02-27 13:28:04 +01:00
parent ee20c303ac
commit 4d751c008e
4 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -368,6 +368,7 @@ AC_CHECK_FUNCS([ \
llseek \
lseek64 \
mempcpy \
mkostemp \
nanosleep \
ntp_gettime \
personality \

2
include/fileutils.h
View File

@ -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)

31
lib/fileutils.c
View File

@ -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);

3
libblkid/src/save.c
View File

@ -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));