chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mount: properly handle LABEL="" in fstab
[elogind.git]
/
src
/
utmp-wtmp.c
diff --git
a/src/utmp-wtmp.c
b/src/utmp-wtmp.c
index de3805e0045bdf6331f4cc3241c417a8c550e648..77baaffacfdec7cc3a49f519bf69731664f61e24 100644
(file)
--- a/
src/utmp-wtmp.c
+++ b/
src/utmp-wtmp.c
@@
-290,10
+290,9
@@
finish:
int utmp_wall(const char *message) {
struct utmpx *u;
int utmp_wall(const char *message) {
struct utmpx *u;
- char date[
26
];
+ char date[
FORMAT_TIMESTAMP_MAX
];
char *text = NULL, *hn = NULL, *un = NULL, *tty = NULL;
int r;
char *text = NULL, *hn = NULL, *un = NULL, *tty = NULL;
int r;
- time_t t;
if (!(hn = gethostname_malloc()) ||
!(un = getlogname_malloc())) {
if (!(hn = gethostname_malloc()) ||
!(un = getlogname_malloc())) {
@@
-301,18
+300,16
@@
int utmp_wall(const char *message) {
goto finish;
}
goto finish;
}
- if ((r = getttyname_malloc(&tty)) < 0)
- goto finish;
-
- time(&t);
- assert_se(ctime_r(&t, date));
- delete_chars(date, "\n\r");
+ getttyname_malloc(&tty);
if (asprintf(&text,
"\a\r\n"
if (asprintf(&text,
"\a\r\n"
- "Broadcast message from %s@%s
on
%s (%s):\r\n\r\n"
+ "Broadcast message from %s@%s
%s
%s (%s):\r\n\r\n"
"%s\r\n\r\n",
"%s\r\n\r\n",
- un, hn, tty, date, message) < 0) {
+ un, hn,
+ tty ? " on " : "", strempty(tty),
+ format_timestamp(date, sizeof(date), now(CLOCK_REALTIME)),
+ message) < 0) {
r = -ENOMEM;
goto finish;
}
r = -ENOMEM;
goto finish;
}