===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/lastcomm/lastcomm.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- src/usr.bin/lastcomm/lastcomm.c	1997/03/03 03:25:10	1.5
+++ src/usr.bin/lastcomm/lastcomm.c	1997/06/02 02:39:42	1.6
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lastcomm.c,v 1.5 1997/03/03 03:25:10 flipk Exp $	*/
+/*	$OpenBSD: lastcomm.c,v 1.6 1997/06/02 02:39:42 flipk Exp $	*/
 /*	$NetBSD: lastcomm.c,v 1.9 1995/10/22 01:43:42 ghudson Exp $	*/
 
 /*
@@ -44,7 +44,7 @@
 #if 0
 static char sccsid[] = "@(#)lastcomm.c	8.2 (Berkeley) 4/29/95";
 #endif
-static char rcsid[] = "$OpenBSD: lastcomm.c,v 1.5 1997/03/03 03:25:10 flipk Exp $";
+static char rcsid[] = "$OpenBSD: lastcomm.c,v 1.6 1997/06/02 02:39:42 flipk Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -125,11 +125,6 @@
 		if (fread(&ab, sizeof(struct acct), 1, fp) != 1)
 			err(1, "%s", acctfile);
 
-		if (fseek(fp, 2 * -(long)sizeof(struct acct), SEEK_CUR) == -1)
-			err(1, "%s", acctfile);
-
-		size -= sizeof(struct acct);
-
 		if (ab.ac_comm[0] == '\0') {
 			ab.ac_comm[0] = '?';
 			ab.ac_comm[1] = '\0';
@@ -138,23 +133,28 @@
 			    p < &ab.ac_comm[fldsiz(acct, ac_comm)] && *p; ++p)
 				if (!isprint(*p))
 					*p = '?';
-		if (*argv && !requested(argv, &ab))
-			continue;
+		if (!*argv || requested(argv, &ab))
+		{
+			t = expand(ab.ac_utime) + expand(ab.ac_stime);
+			(void)printf("%-*.*s %-7s %-*.*s %-*.*s %6.2f secs %.16s",
+				fldsiz(acct, ac_comm), fldsiz(acct, ac_comm),
+				ab.ac_comm, flagbits(ab.ac_flag), UT_NAMESIZE,
+				UT_NAMESIZE, user_from_uid(ab.ac_uid, 0),
+				UT_LINESIZE, UT_LINESIZE, getdev(ab.ac_tty),
+				t / (double)AHZ, ctime(&ab.ac_btime));
+			delta = expand(ab.ac_etime) / (double)AHZ;
+			printf(" (%1.0lf:%02.0lf:%05.2lf)\n",
+				delta / SECSPERHOUR,
+				fmod(delta, SECSPERHOUR) / SECSPERMIN,
+				fmod(delta, SECSPERMIN));
+		}
 
-		t = expand(ab.ac_utime) + expand(ab.ac_stime);
-		(void)printf("%-*.*s %-7s %-*.*s %-*.*s %6.2f secs %.16s",
-		    fldsiz(acct, ac_comm), fldsiz(acct, ac_comm), ab.ac_comm,
-		    flagbits(ab.ac_flag), UT_NAMESIZE, UT_NAMESIZE,
-		    user_from_uid(ab.ac_uid, 0), UT_LINESIZE, UT_LINESIZE,
-		    getdev(ab.ac_tty), t / (double)AHZ, ctime(&ab.ac_btime));
-		delta = expand(ab.ac_etime) / (double)AHZ;
-		printf(" (%1.0lf:%02.0lf:%05.2lf)\n",
-		    delta / SECSPERHOUR,
-		    fmod(delta, SECSPERHOUR) / SECSPERMIN,
-		    fmod(delta, SECSPERMIN));
-
 		if (size == 0)
 			break;
+		/* seek to previous entry */
+		if (fseek(fp, 2 * -(long)sizeof(struct acct), SEEK_CUR) == -1)
+			err(1, "%s", acctfile);
+		size -= sizeof(struct acct);
 	}
 	exit(0);
 }