chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
networkd: support socket activation
[elogind.git]
/
src
/
journal
/
journald-console.c
diff --git
a/src/journal/journald-console.c
b/src/journal/journald-console.c
index 19d077a126fcd34ae824e7eed5ae1e5192e3ea38..5363aaa4ffa1d86e984998f4372c2d08dec6e733 100644
(file)
--- a/
src/journal/journald-console.c
+++ b/
src/journal/journald-console.c
@@
-51,9
+51,9
@@
void server_forward_console(
const struct ucred *ucred) {
struct iovec iovec[5];
const struct ucred *ucred) {
struct iovec iovec[5];
- char header_pid[16];
struct timespec ts;
struct timespec ts;
- char tbuf[4 + DECIMAL_STR_MAX(ts.tv_sec) + DECIMAL_STR_MAX(ts.tv_nsec)-3 + 1];
+ char tbuf[sizeof("[] ")-1 + DECIMAL_STR_MAX(ts.tv_sec) + DECIMAL_STR_MAX(ts.tv_nsec)-3 + 1];
+ char header_pid[sizeof("[]: ")-1 + DECIMAL_STR_MAX(pid_t)];
int n = 0, fd;
_cleanup_free_ char *ident_buf = NULL;
const char *tty;
int n = 0, fd;
_cleanup_free_ char *ident_buf = NULL;
const char *tty;
@@
-67,7
+67,7
@@
void server_forward_console(
/* First: timestamp */
if (prefix_timestamp()) {
assert_se(clock_gettime(CLOCK_MONOTONIC, &ts) == 0);
/* First: timestamp */
if (prefix_timestamp()) {
assert_se(clock_gettime(CLOCK_MONOTONIC, &ts) == 0);
-
snprintf(tbuf, sizeof(tbuf)
, "[%5"PRI_TIME".%06ld] ",
+
xsprintf(tbuf
, "[%5"PRI_TIME".%06ld] ",
ts.tv_sec,
ts.tv_nsec / 1000);
IOVEC_SET_STRING(iovec[n++], tbuf);
ts.tv_sec,
ts.tv_nsec / 1000);
IOVEC_SET_STRING(iovec[n++], tbuf);
@@
-80,8
+80,7
@@
void server_forward_console(
identifier = ident_buf;
}
identifier = ident_buf;
}
- snprintf(header_pid, sizeof(header_pid), "["PID_FMT"]: ", ucred->pid);
- char_array_0(header_pid);
+ xsprintf(header_pid, "["PID_FMT"]: ", ucred->pid);
if (identifier)
IOVEC_SET_STRING(iovec[n++], identifier);
if (identifier)
IOVEC_SET_STRING(iovec[n++], identifier);
@@
-100,12
+99,12
@@
void server_forward_console(
fd = open_terminal(tty, O_WRONLY|O_NOCTTY|O_CLOEXEC);
if (fd < 0) {
fd = open_terminal(tty, O_WRONLY|O_NOCTTY|O_CLOEXEC);
if (fd < 0) {
- log_debug
(
"Failed to open %s for logging: %m", tty);
+ log_debug
_errno(errno,
"Failed to open %s for logging: %m", tty);
return;
}
if (writev(fd, iovec, n) < 0)
return;
}
if (writev(fd, iovec, n) < 0)
- log_debug
(
"Failed to write to %s for logging: %m", tty);
+ log_debug
_errno(errno,
"Failed to write to %s for logging: %m", tty);
safe_close(fd);
}
safe_close(fd);
}