Fix some compiler warnings emitted by gcc-4.8.0

[oweals/busybox.git] / miscutils / last_fancy.c

diff --git a/miscutils/last_fancy.c b/miscutils/last_fancy.c
index d234a48bfc6ff583a4c6ba9d7eea93b969861c46..f687d7e16c7c201c4f784624810c2b95c814e67b 100644 (file)
--- a/miscutils/last_fancy.c
+++ b/miscutils/last_fancy.c
@@ -4,11 +4,13 @@
  *
  * 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
@@ -45,8 +47,12 @@ static void show_entry(struct utmp *ut, int state, time_t dur_secs)
        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);
@@ -87,14 +93,14 @@ static void show_entry(struct utmp *ut, int state, time_t dur_secs)
        }
 
        printf(HEADER_FORMAT,
-                  ut->ut_name,
-                  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)
@@ -112,19 +118,19 @@ static int get_ut_type(struct utmp *ut)
                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;
                }
@@ -145,7 +151,7 @@ static int is_runlevel_shutdown(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;
@@ -155,11 +161,10 @@ int last_main(int argc ATTRIBUTE_UNUSED, char **argv)
        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 */
@@ -196,18 +201,18 @@ int last_main(int argc ATTRIBUTE_UNUSED, char **argv)
                xlseek(file, pos, SEEK_SET);
                xread(file, &ut, sizeof(ut));
                /* rewritten by each record, eventially will have
-                * first record's ut_time: */
-               start_time = ut.ut_time;
+                * 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;
                        }
@@ -240,7 +245,7 @@ int last_main(int argc ATTRIBUTE_UNUSED, char **argv)
                                        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);
@@ -271,7 +276,7 @@ int last_main(int argc ATTRIBUTE_UNUSED, char **argv)
                }
 
                if (going_down) {
-                       boot_time = ut.ut_time;
+                       boot_time = ut.ut_tv.tv_sec;
                        llist_free(zlist, free);
                        zlist = NULL;
                        going_down = 0;