1
0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-02 12:20:51 +00:00

Back out part of rev 1.51. The lesser impact fix is to just remove

the unused global var.
This commit is contained in:
David E. O'Brien 2002-03-07 22:36:56 +00:00
parent 5a236bc7d7
commit 716ced0b62
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=91837

View File

@ -93,7 +93,6 @@ struct utmp utmp;
struct winsize ws;
kvm_t *kd;
time_t now; /* the current time of day */
time_t uptime; /* time of last reboot & elapsed time since */
int ttywidth; /* width of tty */
int argwidth; /* width of tty */
int header = 1; /* true if -h flag: don't print heading */
@ -425,7 +424,7 @@ pr_header(nowp, nusers)
int nusers;
{
double avenrun[3];
time_t luptime;
time_t uptime;
int days, hrs, i, mins, secs;
int mib[2];
size_t size;
@ -448,15 +447,15 @@ pr_header(nowp, nusers)
size = sizeof(boottime);
if (sysctl(mib, 2, &boottime, &size, NULL, 0) != -1 &&
boottime.tv_sec != 0) {
luptime = now - boottime.tv_sec;
if (luptime > 60)
luptime += 30;
days = luptime / 86400;
luptime %= 86400;
hrs = luptime / 3600;
luptime %= 3600;
mins = luptime / 60;
secs = luptime % 60;
uptime = now - boottime.tv_sec;
if (uptime > 60)
uptime += 30;
days = uptime / 86400;
uptime %= 86400;
hrs = uptime / 3600;
uptime %= 3600;
mins = uptime / 60;
secs = uptime % 60;
(void)printf(" up");
if (days > 0)
(void)printf(" %d day%s,", days, days > 1 ? "s" : "");