X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Fwho.c;h=95ad2195355cf498fb6d45f35cc0fa15e0db4676;hb=519d7df930d2ac14b7a833c0255a4a5abd5a329b;hp=0531326bd60c073b2a0837c8a9bd5eb0b662e471;hpb=5b2e27137d3468afb29df719e4b7d1e4da05cd48;p=oweals%2Fbusybox.git

diff --git a/coreutils/who.c b/coreutils/who.c
index 0531326bd..95ad21953 100644
--- a/coreutils/who.c
+++ b/coreutils/who.c
@@ -11,73 +11,57 @@
  *    http://www.gnu.org/copyleft/gpl.html
  *
  * Copyright (c) 2002 AYR Networks, Inc.
+ *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ *
  *----------------------------------------------------------------------
  */
 
-#include <sys/types.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdlib.h>
+#include "busybox.h"
 #include <utmp.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <string.h>
 #include <time.h>
-#include "busybox.h"
 
-extern int who_main(int argc, char **argv)
+static const char * idle_string (time_t t)
 {
-    struct utmp *ut;
-    struct stat st;
-    int         devlen, len;
-    time_t      now, idle;
-
-    if (argc > 1)
-        bb_show_usage();
-
-    setutent();
-    devlen = sizeof("/dev/") - 1;
-    printf("USER       TTY      IDLE      FROM           HOST\n");
+	static char str[6];
+	
+	time_t s = time(NULL) - t;
 
-    while ((ut = getutent()) != NULL) {
-        char name[40];
-
-        if (ut->ut_user[0] && ut->ut_type == USER_PROCESS) {
-            len = strlen(ut->ut_line);
-            if (ut->ut_line[0] == '/') {
-               strncpy(name, ut->ut_line, len);
-               name[len] = '\0';
-               strcpy(ut->ut_line, ut->ut_line + devlen);
-            } else {
-               strcpy(name, "/dev/");
-               strncpy(name+devlen, ut->ut_line, len);
-               name[devlen+len] = '\0';
-            }
-
-            printf("%-10s %-8s ", ut->ut_user, ut->ut_line);
-
-            if (stat(name, &st) == 0) {
-                now = time(NULL);
-                idle = now -  st.st_atime;
-
-                if (idle < 60)
-                    printf("00:00m    ");
-                else if (idle < (60 * 60))
-                    printf("00:%02dm    ", (int)(idle / 60));
-                else if (idle < (24 * 60 * 60))
-                    printf("%02d:%02dm    ", (int)(idle / (60 * 60)),
-                           (int)(idle % (60 * 60)) / 60);
-                else if (idle < (24 * 60 * 60 * 365))
-                    printf("%03ddays   ", (int)(idle / (24 * 60 * 60)));
-                else
-                    printf("%02dyears   ", (int) (idle / (24 * 60 * 60 * 365)));
-            } else
-                printf("%-8s  ", "?");
+	if (s < 60)
+		return ".";
+	if (s < (24 * 60 * 60)) {
+		sprintf (str, "%02d:%02d",
+				(int) (s / (60 * 60)),
+				(int) ((s % (60 * 60)) / 60));
+		return str;
+	}
+	return "old";
+}
 
-            printf("%-12.12s   %s\n", ctime((time_t*)&(ut->ut_tv.tv_sec)) + 4, ut->ut_host);
-        }
-    }
-    endutent();
+int who_main(int argc, char **argv)
+{
+	struct utmp *ut;
+	struct stat st;
+	char *name;
+	
+	if (argc > 1) {
+		bb_show_usage();
+	}
+	
+	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;
 
-    return 0;
+			/* 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);
+		}
+	}
+	if (ENABLE_FEATURE_CLEAN_UP) endutent();
+	return 0;
 }