procps/proc/uptime.c
Jim Warner 34395be330 library: suppress zero 'days' under the <uptime.h> API
The former whattime logic used to suppress that 'days'
output when the system had been up less than 24 hours.

But since the refactor for newlib, '0 days' was always
output under those conditions. So this commit restores
the former expected behavior of suppressing that item.

[ plus an erroneous calculation of uphours was fixed ]

[ and the clang warnings shown below were also fixed ]

Reference(s):
proc/uptime.c:74:10: warning: unused variable 'buf' [-Wunused-variable]
    char buf[256];
         ^
proc/uptime.c:131:58: warning: data argument not used by format string [-Wformat-extra-args]
        pos += sprintf(upbuf + pos, "%d min, ", uphours, upminutes);
                                    ~~~~~~~~~~           ^
proc/uptime.c:175:15: warning: expression result unused [-Wunused-value]
        comma +1;
        ~~~~~ ^~

Signed-off-by: Jim Warner <james.warner@comcast.net>
2015-09-06 21:59:17 +10:00

217 lines
5.9 KiB
C

/*
* uptime - uptime related functions - part of procps
*
* Copyright (C) 1992-1998 Michael K. Johnson <johnsonm@redhat.com>
* Copyright (C) ???? Larry Greenfield <greenfie@gauss.rutgers.edu>
* Copyright (C) 1993 J. Cowley
* Copyright (C) 1998-2003 Albert Cahalan
* Copyright (C) 2015 Craig Small <csmall@enc.com.au>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <errno.h>
#include <locale.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <time.h>
#include <unistd.h>
#include <utmp.h>
#include <proc/uptime.h>
#include <proc/sysinfo.h>
#include "procps-private.h"
#define UPTIME_FILE "/proc/uptime"
static __thread char upbuf[128];
static __thread char shortbuf[128];
static int count_users(void)
{
int numuser = 0;
struct utmp *ut;
setutent();
while ((ut = getutent())) {
if ((ut->ut_type == USER_PROCESS) && (ut->ut_name[0] != '\0'))
numuser++;
}
endutent();
return numuser;
}
/*
* uptime:
*
* Find the uptime and idle time of the system.
* These numbers are found in /proc/uptime
* Unlike other procps functions this closes the file each time
* Either uptime_secs or idle_secs can be null
*
* Returns: uptime_secs on success and <0 on failure
*/
PROCPS_EXPORT int procps_uptime(
double *restrict uptime_secs,
double *restrict idle_secs)
{
double up=0, idle=0;
char *savelocale;
FILE *fp;
if ((fp = fopen(UPTIME_FILE, "r")) == NULL)
return -errno;
savelocale = strdup(setlocale(LC_NUMERIC, NULL));
setlocale(LC_NUMERIC, "C");
if (fscanf(fp, "%lf %lf", &up, &idle) < 2) {
setlocale(LC_NUMERIC, savelocale);
free(savelocale);
fclose(fp);
return -ERANGE;
}
fclose(fp);
setlocale(LC_NUMERIC, savelocale);
free(savelocale);
if (uptime_secs)
*uptime_secs = up;
if (idle_secs)
*idle_secs = idle;
return up;
}
/*
* procps_uptime_sprint:
*
* Print current time in nice format
*
* Returns a statically allocated upbuf or NULL on error
*/
PROCPS_EXPORT char *procps_uptime_sprint(void)
{
int upminutes, uphours, updays, users;
int pos;
time_t realseconds;
struct tm *realtime;
double uptime_secs, idle_secs;
double av1, av5, av15;
upbuf[0] = '\0';
if (time(&realseconds) < 0)
return upbuf;
realtime = localtime(&realseconds);
if (procps_uptime(&uptime_secs, &idle_secs) < 0)
return upbuf;
updays = ((int) uptime_secs / (60*60*24));
uphours = ((int) uptime_secs / (60*60)) % 24;
upminutes = ((int) uptime_secs / (60)) % 60;
pos = sprintf(upbuf, " %02d:%02d:%02d up ",
realtime->tm_hour, realtime->tm_min, realtime->tm_sec);
if (updays)
pos += sprintf(upbuf + pos, "%d %s", updays, (updays > 1) ? "days" : "day");
if (uphours)
pos += sprintf(upbuf + pos, "%2d:%02d, ", uphours, upminutes);
else
pos += sprintf(upbuf + pos, "%d min, ", upminutes);
users = count_users();
procps_loadavg(&av1, &av5, &av15);
pos += sprintf(upbuf + pos, "%2d %s, load average: %.2f, %.2f, %.2f",
users, users > 1 ? "users" : "user",
av1, av5, av15);
return upbuf;
}
/*
* procps_uptime_sprint_short:
*
* Print current time in nice format
*
* Returns a statically allocated buffer or NULL on error
*/
PROCPS_EXPORT char *procps_uptime_sprint_short(void)
{
int updecades, upyears, upweeks, updays, uphours, upminutes;
int pos = 3;
int comma = 0;
time_t realseconds;
struct tm *realtime;
double uptime_secs, idle_secs;
shortbuf[0] = '\0';
if (procps_uptime(&uptime_secs, &idle_secs) < 0)
return shortbuf;
updecades = (int) uptime_secs / (60*60*24*365*10);
upyears = ((int) uptime_secs / (60*60*24*365)) % 10;
upweeks = ((int) uptime_secs / (60*60*24*7)) % 52;
updays = ((int) uptime_secs / (60*60*24)) % 7;
uphours = ((int) uptime_secs / (60*60)) % 24;
upminutes = ((int) uptime_secs / (60)) % 60;
strcat(shortbuf, "up ");
if (updecades) {
pos += sprintf(shortbuf + pos, "%d %s",
updecades, updecades > 1 ? "decades" : "decade");
comma += 1;
}
if (upyears) {
pos += sprintf(shortbuf + pos, "%s%d %s",
comma > 0 ? ", " : "", upyears,
upyears > 1 ? "years" : "year");
comma += 1;
}
if (upweeks) {
pos += sprintf(shortbuf + pos, "%s%d %s",
comma > 0 ? ", " : "", upweeks,
upweeks > 1 ? "weeks" : "week");
comma += 1;
}
if (updays) {
pos += sprintf(shortbuf + pos, "%s%d %s",
comma > 0 ? ", " : "", updays,
updays > 1 ? "days" : "day");
comma += 1;
}
if (uphours) {
pos += sprintf(shortbuf + pos, "%s%d %s",
comma > 0 ? ", " : "", uphours,
uphours > 1 ? "hours" : "hour");
comma += 1;
}
if (upminutes) {
pos += sprintf(shortbuf + pos, "%s%d %s",
comma > 0 ? ", " : "", upminutes,
upminutes > 1 ? "minutes" : "minute");
comma += 1;
}
return shortbuf;
}