summaryrefslogtreecommitdiff
path: root/src/shared
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-01-28 13:08:34 +0100
committerLennart Poettering <lennart@poettering.net>2014-01-28 13:08:34 +0100
commitd37a91e860ce953079870bdbd2526b2c04bb9ea5 (patch)
tree76155798bcd1b4e8de7cab11be13a3f549d0b0fa /src/shared
parentb89446bb33fbe6b9820efdbea62433657757a03f (diff)
util: simplify mkostemp_safe()
Make it use dev_urandom() and endswith().
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/util.c31
1 files changed, 19 insertions, 12 deletions
diff --git a/src/shared/util.c b/src/shared/util.c
index f452431c67..0e7d5c5fb3 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -3835,12 +3835,13 @@ char* hostname_cleanup(char *s, bool lowercase) {
}
int pipe_eof(int fd) {
- int r;
struct pollfd pollfd = {
.fd = fd,
.events = POLLIN|POLLHUP,
};
+ int r;
+
r = poll(&pollfd, 1, 0);
if (r < 0)
return -errno;
@@ -6111,23 +6112,29 @@ int writev_safe(int fd, const struct iovec *w, int j) {
}
int mkostemp_safe(char *pattern, int flags) {
- char *s = pattern + strlen(pattern) - 6;
- uint64_t tries = TMP_MAX;
- int randfd, fd, i;
+ unsigned long tries = TMP_MAX;
+ char *s;
+ int r;
- assert(streq(s, "XXXXXX"));
+ assert(pattern);
- randfd = open("/dev/urandom", O_RDONLY);
- if (randfd < 0)
- return -ENOSYS;
+ /* This is much like like mkostemp() but avoids using any
+ * static variables, thus is async signal safe */
+
+ s = endswith(pattern, "XXXXXX");
+ if (!s)
+ return -EINVAL;
while (tries--) {
- fd = read(randfd, s, 6);
- if (fd == 0)
- return -ENOSYS;
+ 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] % strlen(ALPHANUMERICAL)];
+ s[i] = ALPHANUMERICAL[(unsigned) s[i] % (sizeof(ALPHANUMERICAL)-1)];
fd = open(pattern, flags|O_EXCL|O_CREAT, S_IRUSR|S_IWUSR);
if (fd >= 0)