X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Futmp-wtmp.c;h=7fb6fe3a6751602718039b2a8da55772cbaca2e7;hp=5ee3d22e71e43ea083c876b63d065e14cbfe10df;hb=e777ddfd71f3b2d3217ffe74f287388832915d0b;hpb=b92bea5d2a9481de69bb627a7b442a9f58fca43d diff --git a/src/shared/utmp-wtmp.c b/src/shared/utmp-wtmp.c index 5ee3d22e7..7fb6fe3a6 100644 --- a/src/shared/utmp-wtmp.c +++ b/src/shared/utmp-wtmp.c @@ -21,12 +21,11 @@ #include #include -#include #include #include #include #include -#include +#include #include "macro.h" #include "path-util.h" @@ -46,13 +45,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 +67,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 +91,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 +140,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 +169,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 +180,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 +190,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); @@ -203,36 +203,39 @@ static const char *sanitize_id(const char *id) { } int utmp_put_init_process(const char *id, pid_t pid, pid_t sid, const char *line) { - struct utmpx store; + struct utmpx store = { + .ut_type = INIT_PROCESS, + .ut_pid = pid, + .ut_session = sid, + }; 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); } 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 +259,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 +267,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 +291,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,16 +346,19 @@ 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, bool (*match_tty)(const char *tty)) { + _cleanup_free_ char *text = NULL, *hn = NULL, *un = NULL, *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); @@ -360,22 +367,20 @@ int utmp_wall(const char *message, bool (*match_tty)(const char *tty)) { "\a\r\n" "Broadcast message from %s@%s%s%s (%s):\r\n\r\n" "%s\r\n\r\n", - un, hn, + un ?: username, hn, tty ? " on " : "", strempty(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 +389,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)) { + q = write_to_terminal(path, text); + if (q < 0) r = q; - - free(buf); + } } -finish: - free(hn); - free(un); - free(tty); - free(text); - return r; }