Size reduction by Tito.

This commit is contained in:
Rob Landley 2006-03-11 18:22:35 +00:00
parent 9e094552c8
commit 1c60d9762e

View File

@ -14,14 +14,10 @@
*---------------------------------------------------------------------- *----------------------------------------------------------------------
*/ */
#include <sys/types.h> #include <stdio.h>
#include <fcntl.h>
#include <unistd.h>
#include <stdlib.h> #include <stdlib.h>
#include <utmp.h> #include <utmp.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <errno.h>
#include <string.h>
#include <time.h> #include <time.h>
#include "busybox.h" #include "busybox.h"
@ -29,36 +25,24 @@ int who_main(int argc, char **argv)
{ {
struct utmp *ut; struct utmp *ut;
struct stat st; struct stat st;
int devlen, len; time_t idle;
time_t now, idle; char *name;
if (argc > 1) if (argc > 1)
bb_show_usage(); bb_show_usage();
setutent(); setutent();
devlen = sizeof("/dev/") - 1;
printf("USER TTY IDLE FROM HOST\n"); printf("USER TTY IDLE FROM HOST\n");
while ((ut = getutent()) != NULL) { while ((ut = getutent()) != NULL) {
char name[40];
if (ut->ut_user[0] && ut->ut_type == USER_PROCESS) { if (ut->ut_user[0] && ut->ut_type == USER_PROCESS) {
len = strlen(ut->ut_line); /* ut->ut_line is device name of tty - "/dev/" */
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); printf("%-10s %-8s ", ut->ut_user, ut->ut_line);
name = concat_path_file("/dev/", ut->ut_line);
if (stat(name, &st) == 0) { if (stat(name, &st) == 0) {
now = time(NULL); idle = time(NULL) - st.st_atime;
idle = now - st.st_atime;
if (idle < 60) if (idle < 60)
printf("00:00m "); printf("00:00m ");
@ -75,6 +59,7 @@ int who_main(int argc, char **argv)
printf("%-8s ", "?"); printf("%-8s ", "?");
printf("%-12.12s %s\n", ctime((time_t*)&(ut->ut_tv.tv_sec)) + 4, ut->ut_host); printf("%-12.12s %s\n", ctime((time_t*)&(ut->ut_tv.tv_sec)) + 4, ut->ut_host);
free(name);
} }
} }
endutent(); endutent();