Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make rup handle uptimes of more than 1 year per pr-3060

This commit is contained in:
perry 1997-01-16 22:18:16 +00:00
parent f286cdd282
commit bf059fab25
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
usr.bin/rup/rup.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rup.c,v 1.12 1996/09/27 01:46:10 thorpej Exp $ */
/* $NetBSD: rup.c,v 1.13 1997/01/16 22:18:16 perry Exp $ */
/*-
* Copyright (c) 1993, John Brezak
@ -34,7 +34,7 @@
*/
#ifndef lint
static char rcsid[] = "$NetBSD: rup.c,v 1.12 1996/09/27 01:46:10 thorpej Exp $";
static char rcsid[] = "$NetBSD: rup.c,v 1.13 1997/01/16 22:18:16 perry Exp $";
#endif /* not lint */
#include <stdio.h>
@ -188,7 +188,8 @@ print_rup_data(host, host_stat)
{
struct tm *tmp_time;
struct tm host_time;
struct tm host_uptime;
unsigned ups=0,upm=0,uph=0,upd=0;
char days_buf[16];
char hours_buf[16];
@ -199,24 +200,27 @@ print_rup_data(host, host_stat)
host_stat->curtime.tv_sec -= host_stat->boottime.tv_sec;
tmp_time = gmtime((time_t *)&host_stat->curtime.tv_sec);
host_uptime = *tmp_time;
ups=host_stat->curtime.tv_sec;
upd=ups/(3600*24);
ups-=upd*3600*24;
uph=ups/3600;
ups-=uph*3600;
upm=ups/60;
if (host_uptime.tm_yday != 0)
sprintf(days_buf, "%3d day%s, ", host_uptime.tm_yday,
(host_uptime.tm_yday > 1) ? "s" : "");
if (upd != 0)
sprintf(days_buf, "%3u day%s, ", upd,
(upd > 1) ? "s" : "");
else
days_buf[0] = '\0';
if (host_uptime.tm_hour != 0)
sprintf(hours_buf, "%2d:%02d, ",
host_uptime.tm_hour, host_uptime.tm_min);
if (uph != 0)
sprintf(hours_buf, "%2u:%02u, ",
uph, upm);
else
if (host_uptime.tm_min != 0)
sprintf(hours_buf, "%2d mins, ", host_uptime.tm_min);
if (upm != 0)
sprintf(hours_buf, "%2u mins, ", upm);
else
hours_buf[0] = '\0';
if (printtime)
printf(" %2d:%02d%cm",
(host_time.tm_hour % 12) ? (host_time.tm_hour % 12) : 12,