chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dbus: allow systemd to receive activation requests
[elogind.git]
/
src
/
utmp-wtmp.c
diff --git
a/src/utmp-wtmp.c
b/src/utmp-wtmp.c
index cb3f201322edbef648ca68b7bf5cb8933d231711..ba0273f7763aeac786eeec7b31bd3de29158de7d 100644
(file)
--- a/
src/utmp-wtmp.c
+++ b/
src/utmp-wtmp.c
@@
-89,7
+89,7
@@
int utmp_get_runlevel(int *runlevel, int *previous) {
return r;
}
return r;
}
-static void init_entry(struct utmpx *store, usec_t t
imestamp
) {
+static void init_entry(struct utmpx *store, usec_t t) {
struct utsname uts;
assert(store);
struct utsname uts;
assert(store);
@@
-97,11
+97,11
@@
static void init_entry(struct utmpx *store, usec_t timestamp) {
zero(*store);
zero(uts);
zero(*store);
zero(uts);
- if (t
imestamp
<= 0)
- t
imestamp
= now(CLOCK_REALTIME);
+ if (t <= 0)
+ t = now(CLOCK_REALTIME);
- store->ut_tv.tv_sec = t
imestamp
/ USEC_PER_SEC;
- store->ut_tv.tv_usec = t
imestamp
% USEC_PER_SEC;
+ store->ut_tv.tv_sec = t / USEC_PER_SEC;
+ store->ut_tv.tv_usec = t % USEC_PER_SEC;
if (uname(&uts) >= 0)
strncpy(store->ut_host, uts.release, sizeof(store->ut_host));
if (uname(&uts) >= 0)
strncpy(store->ut_host, uts.release, sizeof(store->ut_host));
@@
-162,10
+162,10
@@
static int write_entry_both(const struct utmpx *store) {
return r;
}
return r;
}
-int utmp_put_shutdown(usec_t t
imestamp
) {
+int utmp_put_shutdown(usec_t t) {
struct utmpx store;
struct utmpx store;
- init_entry(&store, t
imestamp
);
+ init_entry(&store, t);
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));
@@
-173,10
+173,10
@@
int utmp_put_shutdown(usec_t timestamp) {
return write_entry_both(&store);
}
return write_entry_both(&store);
}
-int utmp_put_reboot(usec_t t
imestamp
) {
+int utmp_put_reboot(usec_t t) {
struct utmpx store;
struct utmpx store;
- init_entry(&store, t
imestamp
);
+ init_entry(&store, t);
store.ut_type = BOOT_TIME;
strncpy(store.ut_user, "reboot", sizeof(store.ut_user));
store.ut_type = BOOT_TIME;
strncpy(store.ut_user, "reboot", sizeof(store.ut_user));
@@
-184,7
+184,7
@@
int utmp_put_reboot(usec_t timestamp) {
return write_entry_both(&store);
}
return write_entry_both(&store);
}
-int utmp_put_runlevel(usec_t t
imestamp
, int runlevel, int previous) {
+int utmp_put_runlevel(usec_t t, int runlevel, int previous) {
struct utmpx store;
int r;
struct utmpx store;
int r;
@@
-204,7
+204,7
@@
int utmp_put_runlevel(usec_t timestamp, int runlevel, int previous) {
return 0;
}
return 0;
}
- init_entry(&store, t
imestamp
);
+ init_entry(&store, t);
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);