X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Futmp-wtmp.c;h=217ae1e2c734ceca3168f1bbeb00463cc9766dbb;hp=41589303ba63cc651aba5f775f7e0470c6bf50f7;hb=0071d9f1db6dc9a1035cf5afb81455b67ed462f6;hpb=169c1bda807d183a362b47efe0b5b56e9320e430

diff --git a/src/utmp-wtmp.c b/src/utmp-wtmp.c
index 41589303b..217ae1e2c 100644
--- a/src/utmp-wtmp.c
+++ b/src/utmp-wtmp.c
@@ -155,11 +155,11 @@ static int write_entry_wtmp(const struct utmpx *store) {
         return -errno;
 }
 
-static int write_entry_both(const struct utmpx *store) {
+static int write_utmp_wtmp(const struct utmpx *store_utmp, const struct utmpx *store_wtmp) {
         int r, s;
 
-        r = write_entry_utmp(store);
-        s = write_entry_wtmp(store);
+        r = write_entry_utmp(store_utmp);
+        s = write_entry_wtmp(store_wtmp);
 
         if (r >= 0)
                 r = s;
@@ -172,10 +172,14 @@ static int write_entry_both(const struct utmpx *store) {
         return r;
 }
 
-int utmp_put_shutdown(usec_t t) {
+static int write_entry_both(const struct utmpx *store) {
+        return write_utmp_wtmp(store, store);
+}
+
+int utmp_put_shutdown(void) {
         struct utmpx store;
 
-        init_entry(&store, t);
+        init_entry(&store, 0);
 
         store.ut_type = RUN_LVL;
         strncpy(store.ut_user, "shutdown", sizeof(store.ut_user));
@@ -206,12 +210,12 @@ static const char *sanitize_id(const char *id) {
         return id + l - sizeof(((struct utmpx*) NULL)->ut_id);
 }
 
-int utmp_put_init_process(usec_t t, const char *id, pid_t pid, pid_t sid, const char *line) {
+int utmp_put_init_process(const char *id, pid_t pid, pid_t sid, const char *line) {
         struct utmpx store;
 
         assert(id);
 
-        init_timestamp(&store, t);
+        init_timestamp(&store, 0);
 
         store.ut_type = INIT_PROCESS;
         store.ut_pid = pid;
@@ -226,7 +230,7 @@ int utmp_put_init_process(usec_t t, const char *id, pid_t pid, pid_t sid, const
 }
 
 int utmp_put_dead_process(const char *id, pid_t pid, int code, int status) {
-        struct utmpx lookup, store, *found;
+        struct utmpx lookup, store, store_wtmp, *found;
 
         assert(id);
 
@@ -242,9 +246,7 @@ int utmp_put_dead_process(const char *id, pid_t pid, int code, int status) {
         if (found->ut_pid != pid)
                 return 0;
 
-        zero(store);
-
-        memcpy(&store, &lookup, sizeof(store));
+        memcpy(&store, found, sizeof(store));
         store.ut_type = DEAD_PROCESS;
         store.ut_exit.e_termination = code;
         store.ut_exit.e_exit = status;
@@ -253,11 +255,15 @@ int utmp_put_dead_process(const char *id, pid_t pid, int code, int status) {
         zero(store.ut_host);
         zero(store.ut_tv);
 
-        return write_entry_both(&store);
+        memcpy(&store_wtmp, &store, sizeof(store_wtmp));
+        /* wtmp wants the current time */
+        init_timestamp(&store_wtmp, 0);
+
+        return write_utmp_wtmp(&store, &store_wtmp);
 }
 
 
-int utmp_put_runlevel(usec_t t, int runlevel, int previous) {
+int utmp_put_runlevel(int runlevel, int previous) {
         struct utmpx store;
         int r;
 
@@ -277,7 +283,7 @@ int utmp_put_runlevel(usec_t t, int runlevel, int previous) {
         if (previous == runlevel)
                 return 0;
 
-        init_entry(&store, t);
+        init_entry(&store, 0);
 
         store.ut_type = RUN_LVL;
         store.ut_pid = (runlevel & 0xFF) | ((previous & 0xFF) << 8);
@@ -358,7 +364,7 @@ finish:
         return r;
 }
 
-int utmp_wall(const char *message) {
+int utmp_wall(const char *message, bool (*match_tty)(const char *tty)) {
         struct utmpx *u;
         char date[FORMAT_TIMESTAMP_MAX];
         char *text = NULL, *hn = NULL, *un = NULL, *tty = NULL;
@@ -370,7 +376,7 @@ int utmp_wall(const char *message) {
                 goto finish;
         }
 
-        getttyname_malloc(&tty);
+        getttyname_harder(STDIN_FILENO, &tty);
 
         if (asprintf(&text,
                      "\a\r\n"
@@ -407,8 +413,9 @@ int utmp_wall(const char *message) {
                         path = buf;
                 }
 
-                if ((q = write_to_terminal(path, text)) < 0)
-                        r = q;
+                if (!match_tty || match_tty(path))
+                        if ((q = write_to_terminal(path, text)) < 0)
+                                r = q;
 
                 free(buf);
         }