#include "libbb.h"
#include <utmp.h>
+/* NB: ut_name and ut_user are the same field, use only one name (ut_user)
+ * to reduce confusion */
+
#ifndef SHUTDOWN_TIME
# define SHUTDOWN_TIME 254
#endif
char logout_time[8];
const char *logout_str;
const char *duration_str;
+ time_t tmp;
- safe_strncpy(login_time, ctime(&(ut->ut_time)), 17);
+ /* manpages say ut_tv.tv_sec *is* time_t,
+ * but some systems have it wrong */
+ tmp = ut->ut_tv.tv_sec;
+ safe_strncpy(login_time, ctime(&tmp), 17);
snprintf(logout_time, 8, "- %s", ctime(&dur_secs) + 11);
dur_secs = MAX(dur_secs - (time_t)ut->ut_tv.tv_sec, (time_t)0);
hours = mins / 60;
mins = mins % 60;
- if (days) {
+// if (days) {
sprintf(duration, "(%u+%02u:%02u)", days, hours, mins);
- } else {
- sprintf(duration, " (%02u:%02u)", hours, mins);
- }
+// } else {
+// sprintf(duration, " (%02u:%02u)", hours, mins);
+// }
logout_str = logout_time;
duration_str = duration;
}
printf(HEADER_FORMAT,
- ut->ut_name,
+ ut->ut_user,
ut->ut_line,
show_wide ? INET6_ADDRSTRLEN : INET_ADDRSTRLEN,
show_wide ? INET6_ADDRSTRLEN : INET_ADDRSTRLEN,
static int get_ut_type(struct utmp *ut)
{
if (ut->ut_line[0] == '~') {
- if (strncmp(ut->ut_user, "shutdown", sizeof("shutdown")-1) == 0) {
+ if (strcmp(ut->ut_user, "shutdown") == 0) {
return SHUTDOWN_TIME;
}
- if (strncmp(ut->ut_user, "reboot", sizeof("reboot")-1) == 0) {
+ if (strcmp(ut->ut_user, "reboot") == 0) {
return BOOT_TIME;
}
- if (strncmp(ut->ut_user, "runlevel", sizeof("runlevel")-1) == 0) {
+ if (strcmp(ut->ut_user, "runlevel") == 0) {
return RUN_LVL;
}
return ut->ut_type;
}
- if (ut->ut_name[0] == 0) {
+ if (ut->ut_user[0] == 0) {
return DEAD_PROCESS;
}
if ((ut->ut_type != DEAD_PROCESS)
- && (strcmp(ut->ut_name, "LOGIN") != 0)
- && ut->ut_name[0]
+ && (strcmp(ut->ut_user, "LOGIN") != 0)
+ && ut->ut_user[0]
&& ut->ut_line[0]
) {
ut->ut_type = USER_PROCESS;
}
- if (strcmp(ut->ut_name, "date") == 0) {
+ if (strcmp(ut->ut_user, "date") == 0) {
if (ut->ut_line[0] == '|') {
return OLD_TIME;
}
}
int last_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int last_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int last_main(int argc UNUSED_PARAM, char **argv)
{
struct utmp ut;
const char *filename = _PATH_WTMP;
#endif
file = xopen(filename, O_RDONLY);
- if (full_read(file, &ut, sizeof(ut)) != sizeof(ut)) {
+ {
+ /* in case the file is empty... */
struct stat st;
fstat(file, &st);
start_time = st.st_ctime;
- goto exit;
}
- start_time = ut.ut_time;
time(&down_time);
going_down = 0;
boot_down = NORMAL; /* 0 */
zlist = NULL;
boot_time = 0;
- pos = 0;
+ /* get file size, rounding down to last full record */
+ pos = xlseek(file, 0, SEEK_END) / sizeof(ut) * sizeof(ut);
for (;;) {
pos -= (off_t)sizeof(ut);
- /* Bug? What if file changes size?
- * What if size is not a multiple of sizeof(ut)? */
- if (lseek(file, pos, SEEK_END) < 0) {
+ if (pos < 0) {
/* Beyond the beginning of the file boundary =>
* the whole file has been read. */
break;
}
- if (full_read(file, &ut, sizeof(ut)) != sizeof(ut))
- break;
+ xlseek(file, pos, SEEK_SET);
+ xread(file, &ut, sizeof(ut));
+ /* rewritten by each record, eventially will have
+ * first record's ut_tv.tv_sec: */
+ start_time = ut.ut_tv.tv_sec;
switch (get_ut_type(&ut)) {
case SHUTDOWN_TIME:
- down_time = ut.ut_time;
+ down_time = ut.ut_tv.tv_sec;
boot_down = DOWN;
going_down = 1;
break;
case RUN_LVL:
if (is_runlevel_shutdown(&ut)) {
- down_time = ut.ut_time;
+ down_time = ut.ut_tv.tv_sec;
going_down = 1;
boot_down = DOWN;
}
next = el->link;
if (strncmp(up->ut_line, ut.ut_line, UT_LINESIZE) == 0) {
if (show) {
- show_entry(&ut, NORMAL, up->ut_time);
+ show_entry(&ut, NORMAL, up->ut_tv.tv_sec);
show = 0;
}
llist_unlink(&zlist, el);
}
if (going_down) {
- boot_time = ut.ut_time;
+ boot_time = ut.ut_tv.tv_sec;
llist_free(zlist, free);
zlist = NULL;
going_down = 0;
llist_free(zlist, free);
}
- exit:
printf("\nwtmp begins %s", ctime(&start_time));
if (ENABLE_FEATURE_CLEAN_UP)