chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
service: don't warn if the pidfile still exists after SIGCHLD
[elogind.git]
/
src
/
utmp-wtmp.c
diff --git
a/src/utmp-wtmp.c
b/src/utmp-wtmp.c
index 41589303ba63cc651aba5f775f7e0470c6bf50f7..217ae1e2c734ceca3168f1bbeb00463cc9766dbb 100644
(file)
--- 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;
}
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;
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;
if (r >= 0)
r = s;
@@
-172,10
+172,14
@@
static int write_entry_both(const struct utmpx *store) {
return r;
}
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;
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));
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);
}
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);
struct utmpx store;
assert(id);
- init_timestamp(&store,
t
);
+ init_timestamp(&store,
0
);
store.ut_type = INIT_PROCESS;
store.ut_pid = pid;
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) {
}
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);
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;
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;
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);
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;
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;
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);
store.ut_type = RUN_LVL;
store.ut_pid = (runlevel & 0xFF) | ((previous & 0xFF) << 8);
@@
-358,7
+364,7
@@
finish:
return r;
}
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;
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;
}
goto finish;
}
- getttyname_
malloc(
&tty);
+ getttyname_
harder(STDIN_FILENO,
&tty);
if (asprintf(&text,
"\a\r\n"
if (asprintf(&text,
"\a\r\n"
@@
-407,8
+413,9
@@
int utmp_wall(const char *message) {
path = buf;
}
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);
}
free(buf);
}