picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

shared: wtmp-utmp - don't clear store_wtmp in utmp_put_dead_process()

Browse source 
Also modernize a few other things and add comments to explain CID #1237503
and CID #1237504.
This commit is contained in:
Tom Gundersen 2014-09-19 08:03:31 +02:00
parent cbb452e7ef
commit 863f3ce0d0
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/shared/utmp-wtmp.c
View file

@ -92,8 +92,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);
@ -143,7 +141,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);
@ -172,7 +170,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);
@ -183,7 +181,7 @@ int utmp_put_shutdown(void) {
}
int utmp_put_reboot(usec_t t) {
struct utmpx store;
struct utmpx store = {};
init_entry(&store, t);
@ -206,16 +204,17 @@ _pure_ 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)
@ -225,14 +224,15 @@ int utmp_put_init_process(const char *id, pid_t pid, pid_t sid, const char *line
}
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));
found = getutxid(&lookup);
@ -260,7 +260,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);