[BusyBox-cvs] busybox/miscutils last.c, NONE, 1.1 Config.in, 1.7, 1.8 Makefile.in, 1.7, 1.8 dutmp.c, 1.31, NONE

Erik Andersen andersen at busybox.net
Fri Aug 8 22:26:09 UTC 2003


Update of /var/cvs/busybox/miscutils
In directory winder:/tmp/cvs-serv26666/miscutils

Modified Files:
	Config.in Makefile.in 
Added Files:
	last.c 
Removed Files:
	dutmp.c 
Log Message:
Implement a minimalist 'last' which allows the LEAF project to 
no longer need dumtp.  Remove the 'dumtp' applet. 
 -Erik


Index: Makefile.in
===================================================================
RCS file: /var/cvs/busybox/miscutils/Makefile.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile.in	22 Jul 2003 10:11:26 -0000	1.7
+++ Makefile.in	8 Aug 2003 22:26:06 -0000	1.8
@@ -28,8 +28,8 @@
 MISCUTILS-$(CONFIG_CROND)               += crond.o
 MISCUTILS-$(CONFIG_CRONTAB)             += crontab.o
 MISCUTILS-$(CONFIG_DC)			+= dc.o
-MISCUTILS-$(CONFIG_DUTMP)		+= dutmp.o
 MISCUTILS-$(CONFIG_HDPARM)		+= hdparm.o
+MISCUTILS-$(CONFIG_LAST)		+= last.o
 MISCUTILS-$(CONFIG_MAKEDEVS)		+= makedevs.o
 MISCUTILS-$(CONFIG_MT)			+= mt.o
 MISCUTILS-$(CONFIG_STRINGS)		+= strings.o

Index: Config.in
===================================================================
RCS file: /var/cvs/busybox/miscutils/Config.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Config.in	6 Aug 2003 08:57:34 -0000	1.7
+++ Config.in	8 Aug 2003 22:26:06 -0000	1.8
@@ -40,15 +40,11 @@
 	  Dc is a reverse-polish desk calculator which supports unlimited
 	  precision arithmetic.
 
-config CONFIG_DUTMP
-	bool "dutmp"
+config CONFIG_LAST
+	bool "last"
 	default n
 	help
-	  'dutmp' is a utility used by the Linux Router Project (as far as I
-	  know nobody else uses it).  It dumps the contents of the utmp file to
-	  STDOUT with each field seperated by a colon.  IP addresses are are
-	  given in hex in native byte order.  It is intended that this format
-	  can then be parsed by shell scripts.
+	  'last' displays a list of the last users that logged into the system.
 
 config CONFIG_HDPARM
 	bool "hdparm"

--- dutmp.c DELETED ---

--- NEW FILE: last.c ---
/* vi: set sw=4 ts=4: */
/*
 * last implementation for busybox
 *
 * Copyright (C) 2003  Erik Andersen <andersen at codepoet.org>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 * General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 *
 */

#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"

#ifndef SHUTDOWN_TIME
#  define SHUTDOWN_TIME 254
#endif

/* Grr... utmp char[] members  do not have to be nul-terminated.
 * Do what we can while still keeping this reasonably small.
 * Note: We are assuming the ut_id[] size is fixed at 4. */

#if (UT_LINESIZE != 32) || (UT_NAMESIZE != 32) || (UT_HOSTSIZE != 256)
#error struct utmp member char[] size(s) have changed!
#endif

extern int last_main(int argc, char **argv)
{
	struct utmp ut;
	int n, file = STDIN_FILENO;

	if (argc > 1) {
		bb_show_usage();
	}
	file = bb_xopen(_PATH_WTMP, O_RDONLY);

	printf("%-10s %-14s %-18s %-12.12s %s\n", "USER", "TTY", "HOST", "LOGIN", "TIME");
	while ((n = safe_read(file, (void*)&ut, sizeof(struct utmp))) != 0) {

		if (n != sizeof(struct utmp)) {
			bb_perror_msg_and_die("short read");
		}

		if (strncmp(ut.ut_line, "~", 1) == 0) {
			if (strncmp(ut.ut_user, "shutdown", 8) == 0)
				ut.ut_type = SHUTDOWN_TIME;
			else if (strncmp(ut.ut_user, "reboot", 6) == 0)
				ut.ut_type = BOOT_TIME;
			else if (strncmp(ut.ut_user, "runlevel", 7) == 0)
				ut.ut_type = RUN_LVL;
		} else {
			if (!ut.ut_name[0] || strcmp(ut.ut_name, "LOGIN") == 0 || 
					ut.ut_name[0] == 0)
			{
				/* Don't bother.  This means we can't find how long 
				 * someone was logged in for.  Oh well. */
				continue;
			}
			if (ut.ut_type != DEAD_PROCESS &&
					ut.ut_name[0] && ut.ut_line[0])
			{
				ut.ut_type = USER_PROCESS;
			}
			if (strcmp(ut.ut_name, "date") == 0) {
				if (ut.ut_line[0] == '|') ut.ut_type = OLD_TIME;
				if (ut.ut_line[0] == '{') ut.ut_type = NEW_TIME;
			}
		}

		if (ut.ut_type!=USER_PROCESS) {
			switch (ut.ut_type) {
				case OLD_TIME:
				case NEW_TIME:
				case RUN_LVL:
				case SHUTDOWN_TIME:
					continue;
				case BOOT_TIME:
					strcpy(ut.ut_line, "system boot");
					break;
			}
		}

		printf("%-10s %-14s %-18s %-12.12s\n", ut.ut_user, ut.ut_line, ut.ut_host,
				ctime(&(ut.ut_tv.tv_sec)) + 4);
	}

	bb_fflush_stdout_and_exit(EXIT_SUCCESS);
}




More information about the busybox-cvs mailing list