diff options
| author | flipk <flipk@cvs.openbsd.org> | 1997-06-02 02:39:43 +0000 |
|---|---|---|
| committer | flipk <flipk@cvs.openbsd.org> | 1997-06-02 02:39:43 +0000 |
| commit | 950ea97907ef344fd7d0f342c186c9efca41c811 (patch) | |
| tree | 998557f85f6d22c637eb9bedb6d10d80e71f99ad /usr.bin | |
| parent | cdf9a23c7b0765c859bc07383aa644beee807095 (diff) | |
mm, didn't quite get it the first time.
rearrange seek/test/print logic to avoid seeking to before
beginning of file. netbsd/PR #3634, John F. Woods <jfw@jfwhome.funhouse.com>
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/lastcomm/lastcomm.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/usr.bin/lastcomm/lastcomm.c b/usr.bin/lastcomm/lastcomm.c index 66478b358ad..48c746939d4 100644 --- a/usr.bin/lastcomm/lastcomm.c +++ b/usr.bin/lastcomm/lastcomm.c @@ -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 @@ static char copyright[] = #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 @@ main(argc, argv) 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 @@ main(argc, argv) p < &ab.ac_comm[fldsiz(acct, ac_comm)] && *p; ++p) if (!isprint(*p)) *p = '?'; - if (*argv && !requested(argv, &ab)) - continue; - - 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 (!*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)); + } 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); } |