X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Futmp-wtmp.c;h=9750dcd81722f0ba25843e520784b7374f61d398;hp=5ee3d22e71e43ea083c876b63d065e14cbfe10df;hb=HEAD;hpb=b92bea5d2a9481de69bb627a7b442a9f58fca43d
diff --git a/src/shared/utmp-wtmp.c b/src/shared/utmp-wtmp.c
index 5ee3d22e7..9750dcd81 100644
--- a/src/shared/utmp-wtmp.c
+++ b/src/shared/utmp-wtmp.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
/***
This file is part of systemd.
@@ -19,17 +17,28 @@
along with systemd; If not, see .
***/
-#include
#include
-#include
+#include
+#include
+#include
+#include
+#include
#include
+#include
#include
-#include
#include
-#include
+#include
+#include "alloc-util.h"
+#include "fd-util.h"
+#include "hostname-util.h"
#include "macro.h"
#include "path-util.h"
+#include "string-util.h"
+#include "terminal-util.h"
+#include "time-util.h"
+#include "user-util.h"
+#include "util.h"
#include "utmp-wtmp.h"
int utmp_get_runlevel(int *runlevel, int *previous) {
@@ -46,13 +55,15 @@ int utmp_get_runlevel(int *runlevel, int *previous) {
* very new and does not apply to the current script being
* executed. */
- if ((e = getenv("RUNLEVEL")) && e[0] > 0) {
+ e = getenv("RUNLEVEL");
+ if (e && e[0] > 0) {
*runlevel = e[0];
if (previous) {
/* $PREVLEVEL seems to be an Upstart thing */
- if ((e = getenv("PREVLEVEL")) && e[0] > 0)
+ e = getenv("PREVLEVEL");
+ if (e && e[0] > 0)
*previous = e[0];
else
*previous = 0;
@@ -66,7 +77,8 @@ int utmp_get_runlevel(int *runlevel, int *previous) {
setutxent();
- if (!(found = getutxid(&lookup)))
+ found = getutxid(&lookup);
+ if (!found)
r = -errno;
else {
int a, b;
@@ -89,8 +101,6 @@ int utmp_get_runlevel(int *runlevel, int *previous) {
static void init_timestamp(struct utmpx *store, usec_t t) {
assert(store);
- zero(*store);
-
if (t <= 0)
t = now(CLOCK_REALTIME);
@@ -140,7 +150,7 @@ static int write_entry_wtmp(const struct utmpx *store) {
assert(store);
/* wtmp is a simple append-only file where each entry is
- simply appended to * the end; i.e. basically a log. */
+ simply appended to the end; i.e. basically a log. */
errno = 0;
updwtmpx(_PATH_WTMPX, store);
@@ -169,7 +179,7 @@ static int write_entry_both(const struct utmpx *store) {
}
int utmp_put_shutdown(void) {
- struct utmpx store;
+ struct utmpx store = {};
init_entry(&store, 0);
@@ -180,7 +190,7 @@ int utmp_put_shutdown(void) {
}
int utmp_put_reboot(usec_t t) {
- struct utmpx store;
+ struct utmpx store = {};
init_entry(&store, t);
@@ -190,7 +200,7 @@ int utmp_put_reboot(usec_t t) {
return write_entry_both(&store);
}
-static const char *sanitize_id(const char *id) {
+_pure_ static const char *sanitize_id(const char *id) {
size_t l;
assert(id);
@@ -202,37 +212,60 @@ static const char *sanitize_id(const char *id) {
return id + l - sizeof(((struct utmpx*) NULL)->ut_id);
}
-int utmp_put_init_process(const char *id, pid_t pid, pid_t sid, const char *line) {
- struct utmpx store;
+int utmp_put_init_process(const char *id, pid_t pid, pid_t sid, const char *line, int ut_type, const char *user) {
+ struct utmpx store = {
+ .ut_type = INIT_PROCESS,
+ .ut_pid = pid,
+ .ut_session = sid,
+ };
+ int r;
assert(id);
init_timestamp(&store, 0);
- store.ut_type = INIT_PROCESS;
- store.ut_pid = pid;
- store.ut_session = sid;
-
+ /* ut_id needs only be nul-terminated if it is shorter than sizeof(ut_id) */
strncpy(store.ut_id, sanitize_id(id), sizeof(store.ut_id));
if (line)
- strncpy(store.ut_line, path_get_file_name(line), sizeof(store.ut_line));
+ strncpy(store.ut_line, basename(line), sizeof(store.ut_line));
- return write_entry_both(&store);
+ r = write_entry_both(&store);
+ if (r < 0)
+ return r;
+
+ if (ut_type == LOGIN_PROCESS || ut_type == USER_PROCESS) {
+ store.ut_type = LOGIN_PROCESS;
+ r = write_entry_both(&store);
+ if (r < 0)
+ return r;
+ }
+
+ if (ut_type == USER_PROCESS) {
+ store.ut_type = USER_PROCESS;
+ strncpy(store.ut_user, user, sizeof(store.ut_user)-1);
+ r = write_entry_both(&store);
+ if (r < 0)
+ return r;
+ }
+
+ return 0;
}
int utmp_put_dead_process(const char *id, pid_t pid, int code, int status) {
- struct utmpx lookup, store, store_wtmp, *found;
+ struct utmpx lookup = {
+ .ut_type = INIT_PROCESS /* looks for DEAD_PROCESS, LOGIN_PROCESS, USER_PROCESS, too */
+ }, store, store_wtmp, *found;
assert(id);
setutxent();
- zero(lookup);
- lookup.ut_type = INIT_PROCESS; /* looks for DEAD_PROCESS, LOGIN_PROCESS, USER_PROCESS, too */
+ /* ut_id needs only be nul-terminated if it is shorter than sizeof(ut_id) */
strncpy(lookup.ut_id, sanitize_id(id), sizeof(lookup.ut_id));
- if (!(found = getutxid(&lookup)))
+ found = getutxid(&lookup);
+ if (!found)
return 0;
if (found->ut_pid != pid)
@@ -256,7 +289,7 @@ int utmp_put_dead_process(const char *id, pid_t pid, int code, int status) {
int utmp_put_runlevel(int runlevel, int previous) {
- struct utmpx store;
+ struct utmpx store = {};
int r;
assert(runlevel > 0);
@@ -264,7 +297,8 @@ int utmp_put_runlevel(int runlevel, int previous) {
if (previous <= 0) {
/* Find the old runlevel automatically */
- if ((r = utmp_get_runlevel(&previous, NULL)) < 0) {
+ r = utmp_get_runlevel(&previous, NULL);
+ if (r < 0) {
if (r != -ESRCH)
return r;
@@ -287,7 +321,7 @@ int utmp_put_runlevel(int runlevel, int previous) {
#define TIMEOUT_MSEC 50
static int write_to_terminal(const char *tty, const char *message) {
- int _cleanup_close_ fd = -1;
+ _cleanup_close_ int fd = -1;
const char *p;
size_t left;
usec_t end;
@@ -342,40 +376,50 @@ static int write_to_terminal(const char *tty, const char *message) {
return 0;
}
-int utmp_wall(const char *message, bool (*match_tty)(const char *tty)) {
- struct utmpx *u;
+int utmp_wall(
+ const char *message,
+ const char *username,
+ const char *origin_tty,
+ bool (*match_tty)(const char *tty, void *userdata),
+ void *userdata) {
+
+ _cleanup_free_ char *text = NULL, *hn = NULL, *un = NULL, *stdin_tty = NULL;
char date[FORMAT_TIMESTAMP_MAX];
- char *text = NULL, *hn = NULL, *un = NULL, *tty = NULL;
+ struct utmpx *u;
int r;
- if (!(hn = gethostname_malloc()) ||
- !(un = getlogname_malloc())) {
- r = -ENOMEM;
- goto finish;
+ hn = gethostname_malloc();
+ if (!hn)
+ return -ENOMEM;
+ if (!username) {
+ un = getlogname_malloc();
+ if (!un)
+ return -ENOMEM;
}
- getttyname_harder(STDIN_FILENO, &tty);
+ if (!origin_tty) {
+ getttyname_harder(STDIN_FILENO, &stdin_tty);
+ origin_tty = stdin_tty;
+ }
if (asprintf(&text,
"\a\r\n"
"Broadcast message from %s@%s%s%s (%s):\r\n\r\n"
"%s\r\n\r\n",
- un, hn,
- tty ? " on " : "", strempty(tty),
+ un ?: username, hn,
+ origin_tty ? " on " : "", strempty(origin_tty),
format_timestamp(date, sizeof(date), now(CLOCK_REALTIME)),
- message) < 0) {
- r = -ENOMEM;
- goto finish;
- }
+ message) < 0)
+ return -ENOMEM;
setutxent();
r = 0;
while ((u = getutxent())) {
- int q;
+ _cleanup_free_ char *buf = NULL;
const char *path;
- char *buf = NULL;
+ int q;
if (u->ut_type != USER_PROCESS || u->ut_user[0] == 0)
continue;
@@ -384,27 +428,18 @@ int utmp_wall(const char *message, bool (*match_tty)(const char *tty)) {
if (path_startswith(u->ut_line, "/dev/"))
path = u->ut_line;
else {
- if (asprintf(&buf, "/dev/%.*s",
- (int) sizeof(u->ut_line), u->ut_line) < 0) {
- r = -ENOMEM;
- goto finish;
- }
+ if (asprintf(&buf, "/dev/%.*s", (int) sizeof(u->ut_line), u->ut_line) < 0)
+ return -ENOMEM;
path = buf;
}
- if (!match_tty || match_tty(path))
- if ((q = write_to_terminal(path, text)) < 0)
+ if (!match_tty || match_tty(path, userdata)) {
+ q = write_to_terminal(path, text);
+ if (q < 0)
r = q;
-
- free(buf);
+ }
}
-finish:
- free(hn);
- free(un);
- free(tty);
- free(text);
-
return r;
}