picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Base mkostemp_safe on mkostemp

Browse source 
It is nice to wrap umask handling and return convention,
but glibc's mkostemp is async-signal-safe already.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2014-01-28 18:25:31 -05:00
parent 87b0284327
commit 0f010ef213
2 changed files with 6 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/shared/missing.h
View file

@ -324,10 +324,6 @@ static inline int name_to_handle_at(int fd, const char *name, struct file_handle
# define DRM_IOCTL_DROP_MASTER _IO('d', 0x1f)
#endif
#ifndef TMP_MAX
# define TMP_MAX 238328
#endif
#if defined(__i386__) || defined(__x86_64__)
/* The precise definition of __O_TMPFILE is arch specific, so let's

35
src/shared/util.c
View file

@ -6093,43 +6093,20 @@ int getpeersec(int fd, char **ret) {
return 0;
}
/* This is much like like mkostemp() but is subject to umask(). */
int mkostemp_safe(char *pattern, int flags) {
unsigned long tries = TMP_MAX;
char *s;
int r;
_cleanup_umask_ mode_t u;
int fd;
assert(pattern);
u = umask(077);
/* This is much like like mkostemp() but avoids using any
* static variables, thus is async signal safe. Also, it's not
* subject to umask(). */
fd = mkostemp(pattern, flags);
if (fd < 0)
return -errno;
s = endswith(pattern, "XXXXXX");
if (!s)
return -EINVAL;
while (tries--) {
unsigned i;
int fd;
r = dev_urandom(s, 6);
if (r < 0)
return r;
for (i = 0; i < 6; i++)
s[i] = ALPHANUMERICAL[(unsigned) s[i] % (sizeof(ALPHANUMERICAL)-1)];
fd = open(pattern, flags|O_EXCL|O_CREAT|O_NOCTTY|O_NOFOLLOW, S_IRUSR|S_IWUSR);
if (fd >= 0)
return fd;
if (!IN_SET(errno, EEXIST, EINTR))
return -errno;
}
return -EEXIST;
return fd;
}
int open_tmpfile(const char *path, int flags) {