*
* Copyright (C) 2008 by Patricia Muscalu <patricia.muscalu@axis.com>
*
- * Licensed under the GPLv2 or later, see the file LICENSE in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
#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
char logout_time[8];
const char *logout_str;
const char *duration_str;
+ time_t tmp;
- safe_strncpy(login_time, ctime(&(ut->ut_tv.tv_sec)), 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);
}
printf(HEADER_FORMAT,
- ut->ut_user,
- ut->ut_line,
- show_wide ? INET6_ADDRSTRLEN : INET_ADDRSTRLEN,
- show_wide ? INET6_ADDRSTRLEN : INET_ADDRSTRLEN,
- ut->ut_host,
- login_time,
- logout_str,
- duration_str);
+ ut->ut_user,
+ ut->ut_line,
+ show_wide ? INET6_ADDRSTRLEN : INET_ADDRSTRLEN,
+ show_wide ? INET6_ADDRSTRLEN : INET_ADDRSTRLEN,
+ ut->ut_host,
+ login_time,
+ logout_str,
+ duration_str);
}
static int get_ut_type(struct utmp *ut)
}
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;
time_t boot_time;
time_t down_time;
int file;
- unsigned opt;
smallint going_down;
smallint boot_down;
- opt = getopt32(argv, "Wf:" /* "H" */, &filename);
+ /*opt =*/ getopt32(argv, "Wf:" /* "H" */, &filename);
#ifdef BUT_UTIL_LINUX_LAST_HAS_NO_SUCH_OPT
if (opt & LAST_OPT_H) {
/* Print header line */