fd_inc_sndbuf(fd, SNDBUF_SIZE);
if (!__sync_bool_compare_and_swap(&fd_plus_one, 0, fd+1)) {
- close_nointr_nofail(fd);
+ safe_close(fd);
goto retry;
}
_public_ int sd_journal_sendv(const struct iovec *iov, int n) {
PROTECT_ERRNO;
- int fd, buffer_fd;
+ int fd;
+ _cleanup_close_ int buffer_fd = -1;
struct iovec *w;
uint64_t *l;
int i, j = 0;
uint8_t buf[CMSG_SPACE(sizeof(int))];
} control;
struct cmsghdr *cmsg;
- /* We use /dev/shm instead of /tmp here, since we want this to
- * be a tmpfs, and one that is available from early boot on
- * and where unprivileged users can create files. */
- char path[] = "/dev/shm/journal.XXXXXX";
bool have_syslog_identifier = false;
assert_return(iov, -EINVAL);
if (k >= 0)
return 0;
+ /* Fail silently if the journal is not available */
+ if (errno == ENOENT)
+ return 0;
+
if (errno != EMSGSIZE && errno != ENOBUFS)
return -errno;
/* Message doesn't fit... Let's dump the data in a temporary
* file and just pass a file descriptor of it to the other
- * side */
-
- buffer_fd = mkostemp(path, O_CLOEXEC|O_RDWR);
+ * side.
+ *
+ * We use /dev/shm instead of /tmp here, since we want this to
+ * be a tmpfs, and one that is available from early boot on
+ * and where unprivileged users can create files. */
+ buffer_fd = open_tmpfile("/dev/shm", O_RDWR | O_CLOEXEC);
if (buffer_fd < 0)
- return -errno;
-
- if (unlink(path) < 0) {
- close_nointr_nofail(buffer_fd);
- return -errno;
- }
+ return buffer_fd;
n = writev(buffer_fd, w, j);
- if (n < 0) {
- close_nointr_nofail(buffer_fd);
+ if (n < 0)
return -errno;
- }
mh.msg_iov = NULL;
mh.msg_iovlen = 0;
mh.msg_controllen = cmsg->cmsg_len;
k = sendmsg(fd, &mh, MSG_NOSIGNAL);
- close_nointr_nofail(buffer_fd);
-
if (k < 0)
return -errno;
.un.sun_family = AF_UNIX,
.un.sun_path = "/run/systemd/journal/stdout",
};
- int fd;
+ _cleanup_close_ int fd = -1;
char *header;
size_t l;
- ssize_t r;
+ int r;
assert_return(priority >= 0, -EINVAL);
assert_return(priority <= 7, -EINVAL);
return -errno;
r = connect(fd, &sa.sa, offsetof(union sockaddr_union, un.sun_path) + strlen(sa.un.sun_path));
- if (r < 0) {
- close_nointr_nofail(fd);
+ if (r < 0)
return -errno;
- }
- if (shutdown(fd, SHUT_RD) < 0) {
- close_nointr_nofail(fd);
+ if (shutdown(fd, SHUT_RD) < 0)
return -errno;
- }
fd_inc_sndbuf(fd, SNDBUF_SIZE);
header[l++] = '0';
header[l++] = '\n';
- r = loop_write(fd, header, l, false);
- if (r < 0) {
- close_nointr_nofail(fd);
- return (int) r;
- }
+ r = (int) loop_write(fd, header, l, false);
+ if (r < 0)
+ return r;
- if ((size_t) r != l) {
- close_nointr_nofail(fd);
+ if ((size_t) r != l)
return -errno;
- }
- return fd;
+ r = fd;
+ fd = -1;
+ return r;
}
_public_ int sd_journal_print_with_location(int priority, const char *file, const char *line, const char *func, const char *format, ...) {