Bump to version 1.22.1

[platform/upstream/busybox.git] / coreutils / who.c

diff --git a/coreutils/who.c b/coreutils/who.c
index 25d35fa..f955ce6 100644 (file)
--- a/coreutils/who.c
+++ b/coreutils/who.c
@@ -12,57 +12,120 @@
  *
  * 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 "busybox.h"
-#include <utmp.h>
-#include <time.h>
+//config:config WHO
+//config:      bool "who"
+//config:      default y
+//config:      depends on FEATURE_UTMP
+//config:      help
+//config:        who is used to show who is logged on.
 
-static const char * idle_string (time_t t)
-{
-       static char str[6];
+//config:config USERS
+//config:      bool "users"
+//config:      default y
+//config:      depends on FEATURE_UTMP
+//config:      help
+//config:        Print users currently logged on.
+
+//applet:IF_USERS(APPLET_ODDNAME(users, who, BB_DIR_USR_BIN, BB_SUID_DROP, users))
+//applet:IF_WHO(  APPLET(  who, BB_DIR_USR_BIN, BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_USERS) += who.o
+//kbuild:lib-$(CONFIG_WHO) += who.o
+
+//usage:#define users_trivial_usage
+//usage:       ""
+//usage:#define users_full_usage "\n\n"
+//usage:       "Print the users currently logged on"
 
-       time_t s = time(NULL) - t;
+//usage:#define who_trivial_usage
+//usage:       "[-a]"
+//usage:#define who_full_usage "\n\n"
+//usage:       "Show who is logged on\n"
+//usage:     "\n       -a      Show all"
+//usage:     "\n       -H      Print column headers"
 
-       if (s < 60)
-               return ".";
-       if (s < (24 * 60 * 60)) {
-               sprintf(str, "%02d:%02d",
-                               (int) (s / (60 * 60)),
-                               (int) ((s % (60 * 60)) / 60));
-               return str;
+#include "libbb.h"
+
+static void idle_string(char *str6, time_t t)
+{
+       t = time(NULL) - t;
+
+       /*if (t < 60) {
+               str6[0] = '.';
+               str6[1] = '\0';
+               return;
+       }*/
+       if (t >= 0 && t < (24 * 60 * 60)) {
+               sprintf(str6, "%02d:%02d",
+                               (int) (t / (60 * 60)),
+                               (int) ((t % (60 * 60)) / 60));
+               return;
        }
-       return "old";
+       strcpy(str6, "old");
 }
 
-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)
 {
        struct utmp *ut;
-       struct stat st;
-       char *name;
+       unsigned opt;
+       int do_users = (ENABLE_USERS && (!ENABLE_WHO || applet_name[0] == 'u'));
+       const char *fmt = "%s";
 
-       if (argc > 1) {
-               bb_show_usage();
-       }
+       opt_complementary = "=0";
+       opt = getopt32(argv, do_users ? "" : "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)
+               ) {
+                       if (!do_users) {
+                               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);
-                       printf("%-10s %-8s %-8s  %-12.12s   %s\n", ut->ut_user, ut->ut_line,
-                                                                       (stat(name, &st)) ?  "?" : idle_string(st.st_atime),
-                                                                       ctime(&thyme) + 4, ut->ut_host);
-                       if (ENABLE_FEATURE_CLEAN_UP) free(name);
+                               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);
+                               /* 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
+                               );
+                       } else {
+                               printf(fmt, ut->ut_user);
+                               fmt = " %s";
+                       }
                }
        }
-       if (ENABLE_FEATURE_CLEAN_UP) endutent();
-       return 0;
+       if (do_users)
+               bb_putchar('\n');
+       if (ENABLE_FEATURE_CLEAN_UP)
+               endutent();
+       return EXIT_SUCCESS;
 }