emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

library: Update uptime calls to standard format

Browse Source 
Changed all the uptime related functions to use the
standard naming procps_uptime_*
This commit is contained in:
Craig Small
2015-06-29 22:09:59 +10:00
parent 56399212c8
commit 639daf5468
8 changed files with 130 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
uptime.c
View File

@ -1,6 +1,6 @@
/*
* uptime.c - display system uptime
* Copyright (C) 2012 Craig Small <csmall-procps@enc.com.au>
* Copyright (C) 2012-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
@ -33,80 +33,80 @@
static void print_uptime_since()
{
double now, uptime_secs, idle_secs;
time_t up_since_secs;
struct tm *up_since;
struct timeval tim;
double now, uptime_secs, idle_secs;
time_t up_since_secs;
struct tm *up_since;
struct timeval tim;
/* Get the current time and convert it to a double */
gettimeofday(&tim, NULL);
now = tim.tv_sec + (tim.tv_usec / 1000000.0);
/* Get the current time and convert it to a double */
gettimeofday(&tim, NULL);
now = tim.tv_sec + (tim.tv_usec / 1000000.0);
/* Get the uptime and calculate when that was */
uptime(&uptime_secs, &idle_secs);
up_since_secs = (time_t) ((now - uptime_secs) + 0.5);
/* Get the uptime and calculate when that was */
procps_uptime(&uptime_secs, &idle_secs);
up_since_secs = (time_t) ((now - uptime_secs) + 0.5);
/* Show this */
up_since = localtime(&up_since_secs);
printf("%04d-%02d-%02d %02d:%02d:%02d\n",
up_since->tm_year + 1900, up_since->tm_mon + 1, up_since->tm_mday,
up_since->tm_hour, up_since->tm_min, up_since->tm_sec);
/* Show this */
up_since = localtime(&up_since_secs);
printf("%04d-%02d-%02d %02d:%02d:%02d\n",
up_since->tm_year + 1900, up_since->tm_mon + 1, up_since->tm_mday,
up_since->tm_hour, up_since->tm_min, up_since->tm_sec);
}
static void __attribute__ ((__noreturn__)) usage(FILE * out)
{
fputs(USAGE_HEADER, out);
fprintf(out, _(" %s [options]\n"), program_invocation_short_name);
fputs(USAGE_OPTIONS, out);
fputs(_(" -p, --pretty show uptime in pretty format\n"), out);
fputs(USAGE_HELP, out);
fputs(_(" -s, --since system up since\n"), out);
fputs(USAGE_VERSION, out);
fprintf(out, USAGE_MAN_TAIL("uptime(1)"));
fputs(USAGE_HEADER, out);
fprintf(out, _(" %s [options]\n"), program_invocation_short_name);
fputs(USAGE_OPTIONS, out);
fputs(_(" -p, --pretty show uptime in pretty format\n"), out);
fputs(USAGE_HELP, out);
fputs(_(" -s, --since system up since\n"), out);
fputs(USAGE_VERSION, out);
fprintf(out, USAGE_MAN_TAIL("uptime(1)"));
exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
}
int main(int argc, char **argv)
{
int c, p = 0;
int c, p = 0;
static const struct option longopts[] = {
{"pretty", no_argument, NULL, 'p'},
{"help", no_argument, NULL, 'h'},
{"since", no_argument, NULL, 's'},
{"version", no_argument, NULL, 'V'},
{NULL, 0, NULL, 0}
};
static const struct option longopts[] = {
{"pretty", no_argument, NULL, 'p'},
{"help", no_argument, NULL, 'h'},
{"since", no_argument, NULL, 's'},
{"version", no_argument, NULL, 'V'},
{NULL, 0, NULL, 0}
};
#ifdef HAVE_PROGRAM_INVOCATION_NAME
program_invocation_name = program_invocation_short_name;
program_invocation_name = program_invocation_short_name;
#endif
setlocale (LC_ALL, "");
bindtextdomain(PACKAGE, LOCALEDIR);
textdomain(PACKAGE);
atexit(close_stdout);
setlocale (LC_ALL, "");
bindtextdomain(PACKAGE, LOCALEDIR);
textdomain(PACKAGE);
atexit(close_stdout);
while ((c = getopt_long(argc, argv, "phsV", longopts, NULL)) != -1)
switch (c) {
case 'p':
p = 1;
break;
case 'h':
usage(stdout);
case 's':
print_uptime_since();
return EXIT_SUCCESS;
case 'V':
printf(PROCPS_NG_VERSION);
return EXIT_SUCCESS;
default:
usage(stderr);
}
while ((c = getopt_long(argc, argv, "phsV", longopts, NULL)) != -1)
switch (c) {
case 'p':
p = 1;
break;
case 'h':
usage(stdout);
case 's':
print_uptime_since();
return EXIT_SUCCESS;
case 'V':
printf(PROCPS_NG_VERSION);
return EXIT_SUCCESS;
default:
usage(stderr);
}
if (p)
printf("%s\n", sprint_uptime_short());
else
printf("%s\n", sprint_uptime());
return EXIT_SUCCESS;
if (p)
printf("%s\n", procps_uptime_sprint_short());
else
printf("%s\n", procps_uptime_sprint());
return EXIT_SUCCESS;
}