X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=miscutils%2Flast.c;h=888a0a3d120df8e9a3ad3a597cc456d1515a7f1c;hb=2c3b71a0d2e6e94d8fb75c6879b1b8203cea9e5a;hp=a8800bfe64da97566d108023f273c745c3e69a8d;hpb=62d85035895152c8232052dcfb1bbd3b549b7df9;p=oweals%2Fbusybox.git

diff --git a/miscutils/last.c b/miscutils/last.c
index a8800bfe6..888a0a3d1 100644
--- a/miscutils/last.c
+++ b/miscutils/last.c
@@ -4,12 +4,15 @@
  *
  * Copyright (C) 2003-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * Licensed under the GPL version 2, see the file LICENSE in this tarball.
+ * Licensed under GPLv2, 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
 #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);
@@ -89,7 +92,8 @@ int last_main(int argc, char **argv ATTRIBUTE_UNUSED)
 				goto next;
 			}
 			if (ut.ut_type != DEAD_PROCESS
-			 && ut.ut_user[0] && ut.ut_line[0]
+			 && ut.ut_user[0]
+			 && ut.ut_line[0]
 			) {
 				ut.ut_type = USER_PROCESS;
 			}
@@ -114,6 +118,8 @@ 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);