aboutsummaryrefslogtreecommitdiff
path: root/procps/ps.c
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2012-10-10 12:56:24 +0100
committerRon Yorston <rmy@pobox.com>2012-10-10 12:56:24 +0100
commit981a6fcd1323a77d5829c7d574bb40fd1b96dc4d (patch)
treea1e3aadf4de65d7a525c7dd6172546ff577777d5 /procps/ps.c
parent19436cc0ee509a5e356c04f0026919abd417bec4 (diff)
parenteab343e7e1e5331df833aa69f14584e4a6c738f1 (diff)
downloadbusybox-w32-981a6fcd1323a77d5829c7d574bb40fd1b96dc4d.tar.gz
busybox-w32-981a6fcd1323a77d5829c7d574bb40fd1b96dc4d.tar.bz2
busybox-w32-981a6fcd1323a77d5829c7d574bb40fd1b96dc4d.zip
Merge branch 'busybox' into merge
Diffstat (limited to 'procps/ps.c')
-rw-r--r--procps/ps.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/procps/ps.c b/procps/ps.c
index dc6fda61d..e14356482 100644
--- a/procps/ps.c
+++ b/procps/ps.c
@@ -665,9 +665,9 @@ int ps_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
665 time_t now = now; 665 time_t now = now;
666 long uptime; 666 long uptime;
667#endif 667#endif
668 int opts = 0;
669 /* If we support any options, parse argv */ 668 /* If we support any options, parse argv */
670#if ENABLE_SELINUX || ENABLE_FEATURE_SHOW_THREADS || ENABLE_FEATURE_PS_WIDE || ENABLE_FEATURE_PS_LONG 669#if ENABLE_SELINUX || ENABLE_FEATURE_SHOW_THREADS || ENABLE_FEATURE_PS_WIDE || ENABLE_FEATURE_PS_LONG
670 int opts = 0;
671# if ENABLE_FEATURE_PS_WIDE 671# if ENABLE_FEATURE_PS_WIDE
672 /* -w is a bit complicated */ 672 /* -w is a bit complicated */
673 int w_count = 0; 673 int w_count = 0;
@@ -721,10 +721,10 @@ int ps_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
721 * We also show STIME (standard says that -f shows it, -l doesn't). 721 * We also show STIME (standard says that -f shows it, -l doesn't).
722 */ 722 */
723 puts("S UID PID PPID VSZ RSS TTY STIME TIME CMD"); 723 puts("S UID PID PPID VSZ RSS TTY STIME TIME CMD");
724#if ENABLE_FEATURE_PS_LONG 724# if ENABLE_FEATURE_PS_LONG
725 now = time(NULL); 725 now = time(NULL);
726 uptime = get_uptime(); 726 uptime = get_uptime();
727#endif 727# endif
728 } 728 }
729 else { 729 else {
730 puts(" PID USER VSZ STAT COMMAND"); 730 puts(" PID USER VSZ STAT COMMAND");