Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/coreutils/who.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/coreutils/who.c (modified) (2 diffs)

branches/2.2.9/mindi-busybox/coreutils/who.c

@@ -13 +13 @@
  * 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, -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)
@@ -40 +40 @@
 }
 
-int who_main(int argc, char **argv);
-int who_main(int argc, char **argv)
+int who_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int who_main(int argc UNUSED_PARAM, char **argv)
 {
-    char str6[6];
     struct utmp *ut;
-    struct stat st;
-    char *name;
+    unsigned opt;
 
-    if (argc > 1) {
-        bb_show_usage();
-    }
+    opt_complementary = "=0";
+    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] && ut->ut_type == USER_PROCESS) {
-            time_t thyme = ut->ut_tv.tv_sec;
+        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;
 
-            /* ut->ut_line is device name of tty - "/dev/" */
-            name = concat_path_file("/dev", ut->ut_line);
             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);
-            printf("%-10s %-8s %-9s %-14.14s %s\n",
-                    ut->ut_user, ut->ut_line, str6,
-                    ctime(&thyme) + 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)
         endutent();
-    return 0;
+    return EXIT_SUCCESS;
 }