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

Merge commit 'refs/merge-requests/2' of git://gitorious.org/procps/procps into merge-requests/2

Browse Source 
Conflicts:
	uptime.c
This commit is contained in:
Craig Small
2013-09-11 20:50:48 +10:00
parent 13f20a4811 3e7f78d296
commit 5e4d9d5a92
7 changed files with 101 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
uptime.c
View File

@ -58,6 +58,7 @@ 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);
@ -68,9 +69,10 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out)
int main(int argc, char **argv)
{
int c;
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'},
@ -85,8 +87,11 @@ int main(int argc, char **argv)
textdomain(PACKAGE);
atexit(close_stdout);
while ((c = getopt_long(argc, argv, "hsV", longopts, NULL)) != -1)
while ((c = getopt_long(argc, argv, "phsV", longopts, NULL)) != -1)
switch (c) {
case 'p':
p = 1;
break;
case 'h':
usage(stdout);
case 's':
@ -99,6 +104,6 @@ int main(int argc, char **argv)
usage(stderr);
}
print_uptime();
print_uptime(p);
return EXIT_SUCCESS;
}