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=30a0c031f3f08908de7313a62cce39f7141f3b16;hp=6bba325d3ecc25ebcaf9fde3e621889084d10887;hb=e1d758033dc7e101ab32323a0f1649d8daf56a22;hpb=f33d3ec1d7521c91da8b30ad5cb345d6416bb07d diff --git a/src/shared/utmp-wtmp.c b/src/shared/utmp-wtmp.c index 6bba325d3..30a0c031f 100644 --- a/src/shared/utmp-wtmp.c +++ b/src/shared/utmp-wtmp.c @@ -29,10 +29,11 @@ #include #include "macro.h" +#include "path-util.h" #include "utmp-wtmp.h" int utmp_get_runlevel(int *runlevel, int *previous) { - struct utmpx lookup, *found; + struct utmpx *found, lookup = { .ut_type = RUN_LVL }; int r; const char *e; @@ -45,13 +46,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; @@ -65,10 +68,8 @@ int utmp_get_runlevel(int *runlevel, int *previous) { setutxent(); - zero(lookup); - lookup.ut_type = RUN_LVL; - - if (!(found = getutxid(&lookup))) + found = getutxid(&lookup); + if (!found) r = -errno; else { int a, b; @@ -76,15 +77,11 @@ int utmp_get_runlevel(int *runlevel, int *previous) { a = found->ut_pid & 0xFF; b = (found->ut_pid >> 8) & 0xFF; - if (a < 0 || b < 0) - r = -EIO; - else { - *runlevel = a; + *runlevel = a; + if (previous) + *previous = b; - if (previous) - *previous = b; - r = 0; - } + r = 0; } endutxent(); @@ -105,14 +102,12 @@ static void init_timestamp(struct utmpx *store, usec_t t) { } static void init_entry(struct utmpx *store, usec_t t) { - struct utsname uts; + struct utsname uts = {}; assert(store); init_timestamp(store, t); - zero(uts); - if (uname(&uts) >= 0) strncpy(store->ut_host, uts.release, sizeof(store->ut_host)); @@ -198,7 +193,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); @@ -224,7 +219,7 @@ int utmp_put_init_process(const char *id, pid_t pid, pid_t sid, const char *line strncpy(store.ut_id, sanitize_id(id), sizeof(store.ut_id)); if (line) - strncpy(store.ut_line, file_name_from_path(line), sizeof(store.ut_line)); + strncpy(store.ut_line, basename(line), sizeof(store.ut_line)); return write_entry_both(&store); } @@ -240,7 +235,8 @@ int utmp_put_dead_process(const char *id, pid_t pid, int code, int status) { lookup.ut_type = INIT_PROCESS; /* looks for DEAD_PROCESS, LOGIN_PROCESS, USER_PROCESS, too */ 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) @@ -272,7 +268,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; @@ -295,7 +292,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 fd, r; + _cleanup_close_ int fd = -1; const char *p; size_t left; usec_t end; @@ -303,14 +300,10 @@ static int write_to_terminal(const char *tty, const char *message) { assert(tty); assert(message); - if ((fd = open(tty, O_WRONLY|O_NDELAY|O_NOCTTY|O_CLOEXEC)) < 0) + fd = open(tty, O_WRONLY|O_NDELAY|O_NOCTTY|O_CLOEXEC); + if (fd < 0 || !isatty(fd)) return -errno; - if (!isatty(fd)) { - r = -errno; - goto finish; - } - p = message; left = strlen(message); @@ -318,36 +311,31 @@ static int write_to_terminal(const char *tty, const char *message) { while (left > 0) { ssize_t n; - struct pollfd pollfd; + struct pollfd pollfd = { + .fd = fd, + .events = POLLOUT, + }; usec_t t; int k; t = now(CLOCK_MONOTONIC); - if (t >= end) { - r = -ETIME; - goto finish; - } - - zero(pollfd); - pollfd.fd = fd; - pollfd.events = POLLOUT; + if (t >= end) + return -ETIME; - if ((k = poll(&pollfd, 1, (end - t) / USEC_PER_MSEC)) < 0) + k = poll(&pollfd, 1, (end - t) / USEC_PER_MSEC); + if (k < 0) return -errno; - if (k <= 0) { - r = -ETIME; - goto finish; - } - - if ((n = write(fd, p, left)) < 0) { + if (k == 0) + return -ETIME; + n = write(fd, p, left); + if (n < 0) { if (errno == EAGAIN) continue; - r = -errno; - goto finish; + return -errno; } assert((size_t) n <= left); @@ -356,24 +344,22 @@ static int write_to_terminal(const char *tty, const char *message) { left -= n; } - r = 0; - -finish: - close_nointr_nofail(fd); - - return r; + 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); @@ -382,49 +368,40 @@ 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; + /* this access is fine, because strlen("/dev/") << 32 (UT_LINESIZE) */ if (path_startswith(u->ut_line, "/dev/")) path = u->ut_line; else { - if (asprintf(&buf, "/dev/%s", 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; }