[BusyBox] added Linux command "who" to busybox

[Da Chen]

Hi,
   I added Linux command "who" to busybox and it works fine
in i686 and mips platform. I also added commands "mesg", "wall"
and "write" to busybox. They are used in our software currently.
I attach who.c and who.patch here. Please give me suggestions.

who.c is put in directory shellutils . 

   Thanks.

Da Chen
-------------- next part --------------
? who.patch
? shellutils/who.c
Index: include/applets.h
===================================================================
RCS file: /var/cvs/busybox/include/applets.h,v
retrieving revision 1.55
diff -b -w -u -r1.55 applets.h
--- include/applets.h	20 Mar 2002 17:38:36 -0000	1.55
+++ include/applets.h	17 Apr 2002 18:21:45 -0000
@@ -506,6 +506,9 @@
 #ifdef CONFIG_WHICH
 	APPLET(which, which_main, _BB_DIR_USR_BIN)
 #endif
+#ifdef CONFIG_WHO
+	APPLET(who, who_main, _BB_DIR_USR_BIN)
+#endif
 #ifdef CONFIG_WHOAMI
 	APPLET(whoami, whoami_main, _BB_DIR_USR_BIN)
 #endif
Index: include/usage.h
===================================================================
RCS file: /var/cvs/busybox/include/usage.h,v
retrieving revision 1.87
diff -b -w -u -r1.87 usage.h
--- include/usage.h	13 Apr 2002 14:48:48 -0000	1.87
+++ include/usage.h	17 Apr 2002 18:21:45 -0000
@@ -1967,6 +1967,10 @@
 #define which_example_usage \
 	"$ which login\n" \
 	"/bin/login\n"
+#define who_trivial_usage \
+        " "
+#define who_full_usage \
+        "Prints the current user names and related information"
 
 #define whoami_trivial_usage \
 	""
Index: shellutils/Makefile.in
===================================================================
RCS file: /var/cvs/busybox/shellutils/Makefile.in,v
retrieving revision 1.1
diff -b -w -u -r1.1 Makefile.in
--- shellutils/Makefile.in	12 Apr 2002 12:05:52 -0000	1.1
+++ shellutils/Makefile.in	17 Apr 2002 18:21:45 -0000
@@ -46,6 +46,7 @@
 SHELLUTILS-$(CONFIG_TTY)		+= tty.o
 SHELLUTILS-$(CONFIG_UNAME)		+= uname.o
 SHELLUTILS-$(CONFIG_USLEEP)		+= usleep.o
+SHELLUTILS-$(CONFIG_WHO)		+= who.o
 SHELLUTILS-$(CONFIG_WHOAMI)		+= whoami.o
 SHELLUTILS-$(CONFIG_YES)		+= yes.o
 
Index: shellutils/config.in
===================================================================
RCS file: /var/cvs/busybox/shellutils/config.in,v
retrieving revision 1.4
diff -b -w -u -r1.4 config.in
--- shellutils/config.in	6 Dec 2001 15:16:43 -0000	1.4
+++ shellutils/config.in	17 Apr 2002 18:21:45 -0000
@@ -35,6 +35,7 @@
 bool 'tty'		CONFIG_TTY
 bool 'uname'		CONFIG_UNAME
 bool 'usleep'		CONFIG_USLEEP
+bool 'who'		CONFIG_WHO
 bool 'whoami'		CONFIG_WHOAMI
 bool 'yes'		CONFIG_YES
 
-------------- next part --------------
/* vi: set sw=4 ts=4: */
/*----------------------------------------------------------------------
 * Mini who is used to display user name, login time, 
 * idle time and host name.
 *
 * Author: Da Chen  <dchen at ayrnetworks.com>
 *
 * This is a free document; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
 * as published by the Free Software Foundation:
 *    http://www.gnu.org/copyleft/gpl.html
 *
 * Copyright (c) 2002 AYR Networks, Inc. 
 *----------------------------------------------------------------------
 */

#include <sys/types.h>
#include <fcntl.h>
#include <unistd.h>
#include <stdlib.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)
{
    struct utmp *ut;
    struct stat st;
    int         devlen, len;
    time_t      now, idle; 

    if (argc > 1) 
        show_usage();

    setutent();
    devlen = sizeof("/dev/") - 1;
    printf("USER       TTY      IDLE      FROM           HOST\n"); 

    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  ", "?");       
      
            printf("%-12.12s   %s\n", ctime(&(ut->ut_tv.tv_sec)) + 4, ut->ut_host);
        }
    }
    endutent();

    return 0;
}