freebsd-dev/usr.bin/w/pr_time.c
Peter Wemm 69b41093b5 Fix the annoying bug introduced in rev 1.18 that caused each line to be
one character shorter than the previous in a stairstep fashion when long
idle times were involved.

A couple of nits:
- spelling/typo fix.
- some of the easier style(9) fixes where it was bothering me.
- Handle 100+ days idle time (ha!).  Probably the right thing to do is
  to do a snprintf into a buffer and strlen the result rather than doing
  hackery on magic numbers.

XXX the wide (and mostly unused) username and tty columns annoy me since
it it could be used for more useful information for the command. We should
actually count the largest username and tty and adjust like 'ls -l' does.
1999-01-10 15:28:37 +00:00

121 lines
3.6 KiB
C

/*-
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#ifndef lint
#if 0
static char sccsid[] = "@(#)pr_time.c 8.2 (Berkeley) 4/4/94";
#endif
static const char rcsid[] =
"$Id: pr_time.c,v 1.11 1997/12/28 17:50:10 alex Exp $";
#endif /* not lint */
#include <sys/types.h>
#include <sys/time.h>
#include <stdio.h>
#include <string.h>
#include "extern.h"
/*
* pr_attime --
* Print the time since the user logged in.
*
* Note: SCCS forces the bizarre string manipulation, things like
* 8.2 get replaced in the source code.
*/
void
pr_attime(started, now)
time_t *started, *now;
{
static char buf[256];
struct tm *tp;
time_t diff;
char fmt[20];
tp = localtime(started);
diff = *now - *started;
/* If more than a week, use day-month-year. */
if (diff > 86400 * 7)
(void)strcpy(fmt, "%d%b%y");
/* If not today, use day-hour-am/pm. */
else if (*now / 86400 != *started / 86400) {
(void)strcpy(fmt, __CONCAT("%a%", "I%p"));
}
/* Default is hh:mm{am,pm}. */
else {
(void)strcpy(fmt, __CONCAT("%l:%", "M%p"));
}
(void)strftime(buf, sizeof(buf) - 1, fmt, tp);
buf[sizeof(buf) - 1] = '\0';
(void)printf("%s", buf);
}
/*
* pr_idle --
* Display the idle time.
* Returns number of excess characters that were used for long idle time.
*/
int
pr_idle(idle)
time_t idle;
{
/* If idle more than 36 hours, print as a number of days. */
if (idle >= 36 * 3600) {
int days = idle / 86400;
(void)printf(" %dday%s ", days, days > 1 ? "s" : " " );
if (days >= 100)
return (2);
if (days >= 10)
return (1);
}
/* If idle more than an hour, print as HH:MM. */
else if (idle >= 3600)
(void)printf(" %2d:%02d ",
(int)(idle / 3600), (int)((idle % 3600) / 60));
else if (idle / 60 == 0)
(void)printf(" - ");
/* Else print the minutes idle. */
else
(void)printf(" %2d ", (int)(idle / 60));
return (0); /* not idle longer than 9 days */
}