lineedit: do not hang on error, but return error indicator.

[oweals/busybox.git] / coreutils / who.c

diff --git a/coreutils/who.c b/coreutils/who.c
index a206ec54b580670a5d00f50339a11d12878da590..8384d95349d574b36967c4f9fc30d80e825bdfe9 100644 (file)
--- a/coreutils/who.c
+++ b/coreutils/who.c
@@ -12,15 +12,14 @@
  *
  * Copyright (c) 2002 AYR Networks, Inc.
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
  *----------------------------------------------------------------------
  */
-/* BB_AUDIT SUSv3 _NOT_ compliant -- missing options -b, -d, -H, -l, -m, -p, -q, -r, -s, -t, -T, -u; Missing argument 'file'.  */
+/* BB_AUDIT SUSv3 _NOT_ compliant -- missing options -b, -d, -l, -m, -p, -q, -r, -s, -t, -T, -u; Missing argument 'file'.  */
 
 #include "libbb.h"
 #include <utmp.h>
-#include <time.h>
 
 static void idle_string(char *str6, time_t t)
 {
@@ -41,33 +40,49 @@ static void idle_string(char *str6, time_t t)
 }
 
 int who_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int who_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int who_main(int argc UNUSED_PARAM, char **argv)
 {
-       char str6[6];
        struct utmp *ut;
-       struct stat st;
-       char *name;
        unsigned opt;
 
        opt_complementary = "=0";
-       opt = getopt32(argv, "a");
+       opt = getopt32(argv, "aH");
+       if (opt & 2) // -H
+               printf("USER\t\tTTY\t\tIDLE\tTIME\t\t HOST\n");
 
        setutent();
-       printf("USER       TTY      IDLE      TIME            HOST\n");
        while ((ut = getutent()) != NULL) {
-               if (ut->ut_user[0] && (opt || ut->ut_type == USER_PROCESS)) {
-                       /* ut->ut_line is device name of tty - "/dev/" */
-                       name = concat_path_file("/dev", ut->ut_line);
+               if (ut->ut_user[0]
+                && ((opt & 1) || ut->ut_type == USER_PROCESS)
+               ) {
+                       char str6[6];
+                       char name[sizeof("/dev/") + sizeof(ut->ut_line) + 1];
+                       struct stat st;
+                       time_t seconds;
+
                        str6[0] = '?';
                        str6[1] = '\0';
+                       strcpy(name, "/dev/");
+                       safe_strncpy(ut->ut_line[0] == '/' ? name : name + sizeof("/dev/")-1,
+                               ut->ut_line,
+                               sizeof(ut->ut_line)+1
+                       );
                        if (stat(name, &st) == 0)
                                idle_string(str6, st.st_atime);
-                       /* 15 chars for time:   Nov 10 19:33:20 */
-                       printf("%-10s %-8s %-9s %-15.15s %s\n",
-                                       ut->ut_user, ut->ut_line, str6,
-                                       ctime(&(ut->ut_tv.tv_sec)) + 4, ut->ut_host);
-                       if (ENABLE_FEATURE_CLEAN_UP)
-                               free(name);
+                       /* manpages say ut_tv.tv_sec *is* time_t,
+                        * but some systems have it wrong */
+                       seconds = ut->ut_tv.tv_sec;
+                       /* How wide time field can be?
+                        * "Nov 10 19:33:20": 15 chars
+                        * "2010-11-10 19:33": 16 chars
+                        */
+                       printf("%-15.*s %-15.*s %-7s %-16.16s %.*s\n",
+                                       (int)sizeof(ut->ut_user), ut->ut_user,
+                                       (int)sizeof(ut->ut_line), ut->ut_line,
+                                       str6,
+                                       ctime(&seconds) + 4,
+                                       (int)sizeof(ut->ut_host), ut->ut_host
+                       );
                }
        }
        if (ENABLE_FEATURE_CLEAN_UP)