consolidate ESC sequences

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

diff --git a/miscutils/last.c b/miscutils/last.c
index af92e50cf74c39390eeab4054f17176e8a313695..55c03ae41048990b83e225c36a5ff39937360681 100644 (file)
--- a/miscutils/last.c
+++ b/miscutils/last.c
@@ -10,6 +10,9 @@
 #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
@@ -32,7 +35,7 @@
 #endif
 
 int last_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int last_main(int argc, char **argv ATTRIBUTE_UNUSED)
+int last_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 {
        struct utmp ut;
        int n, file = STDIN_FILENO;
@@ -53,7 +56,7 @@ int last_main(int argc, char **argv ATTRIBUTE_UNUSED)
                TYPE_OLD_TIME   /* OLD_TIME, 4 */
        };
 
-       if (argc > 1) {
+       if (argv[1]) {
                bb_show_usage();
        }
        file = xopen(bb_path_wtmp_file, O_RDONLY);
@@ -73,7 +76,7 @@ int last_main(int argc, char **argv ATTRIBUTE_UNUSED)
 /* do we really need to be cautious here? */
                        n = index_in_strings(_ut_usr, ut.ut_user);
                        if (++n > 0)
-                               ut.ut_type = n;
+                               ut.ut_type = n != 3 ? n : SHUTDOWN_TIME;
 #else
                        if (strncmp(ut.ut_user, "shutdown", 8) == 0)
                                ut.ut_type = SHUTDOWN_TIME;
@@ -83,17 +86,18 @@ int last_main(int argc, char **argv ATTRIBUTE_UNUSED)
                                ut.ut_type = RUN_LVL;
 #endif
                } else {
-                       if (ut.ut_name[0] == '\0' || strcmp(ut.ut_name, "LOGIN") == 0) {
+                       if (ut.ut_user[0] == '\0' || strcmp(ut.ut_user, "LOGIN") == 0) {
                                /* Don't bother.  This means we can't find how long
                                 * someone was logged in for.  Oh well. */
                                goto next;
                        }
                        if (ut.ut_type != DEAD_PROCESS
-                        && ut.ut_name[0] && ut.ut_line[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 (n == TYPE_OLD_TIME) { /* '|' */
                                        ut.ut_type = OLD_TIME;
                                }
@@ -114,13 +118,16 @@ int last_main(int argc, char **argv ATTRIBUTE_UNUSED)
                                        strcpy(ut.ut_line, "system boot");
                        }
                }
+               /* manpages say ut_tv.tv_sec *is* time_t,
+                * but some systems have it wrong */
                t_tmp = (time_t)ut.ut_tv.tv_sec;
                printf("%-10s %-14s %-18s %-12.12s\n",
                       ut.ut_user, ut.ut_line, ut.ut_host, ctime(&t_tmp) + 4);
  next:
-               if (!pos)
+               pos -= sizeof(ut);
+               if (pos <= 0)
                        break; /* done. */
-               pos = lseek(file, pos - sizeof(ut), SEEK_SET);
+               xlseek(file, pos, SEEK_SET);
        }
 
        fflush_stdout_and_exit(EXIT_SUCCESS);