3 files changed, 37 insertions, 13 deletions

diff --git a/procps/smemcap.c b/procps/smemcap.c
index f2e2de29d..01acbf74e 100644
--- a/procps/smemcap.c
+++ b/procps/smemcap.c
@@ -66,7 +66,11 @@ static void archivefile(const char *path)
         struct stat s;
 
         /* buffer the file */
-        fd = xopen(path, O_RDONLY);
+        fd = open(path, O_RDONLY);
+        if (fd == -1) {
+                /* skip vanished processes between dir listing and traversal */
+                return;
+        }
         do {
                 cur = xzalloc(sizeof(*cur));
                 *prev = cur;
diff --git a/procps/top.c b/procps/top.c
index 1b49a5e6b..f016f5501 100644
--- a/procps/top.c
+++ b/procps/top.c
@@ -901,11 +901,11 @@ enum {
 };
 
 #if ENABLE_FEATURE_TOP_INTERACTIVE
-static unsigned handle_input(unsigned scan_mask, unsigned interval)
+static unsigned handle_input(unsigned scan_mask, duration_t interval)
 {
         if (option_mask32 & OPT_EOF) {
                 /* EOF on stdin ("top </dev/null") */
-                sleep(interval);
+                sleep_for_duration(interval);
                 return scan_mask;
         }
 
@@ -1092,9 +1092,9 @@ static unsigned handle_input(unsigned scan_mask, unsigned interval)
 int top_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int top_main(int argc UNUSED_PARAM, char **argv)
 {
+        duration_t interval;
         int iterations;
         unsigned col;
-        unsigned interval;
         char *str_interval, *str_iterations;
         unsigned scan_mask = TOP_MASK;
 
@@ -1120,8 +1120,10 @@ int top_main(int argc UNUSED_PARAM, char **argv)
                 /* work around for "-d 1" -> "-d -1" done by make_all_argv_opts() */
                 if (str_interval[0] == '-')
                         str_interval++;
+                interval = parse_duration_str(str_interval);
                 /* Need to limit it to not overflow poll timeout */
-                interval = xatou16(str_interval);
+                if (interval > INT_MAX / 1000)
+                        interval = INT_MAX / 1000;
         }
         if (col & OPT_n) {
                 if (str_iterations[0] == '-')
@@ -1169,7 +1171,7 @@ int top_main(int argc UNUSED_PARAM, char **argv)
                         /* We output to stdout, we need size of stdout (not stdin)! */
                         get_terminal_width_height(STDOUT_FILENO, &col, &G.lines);
                         if (G.lines < 5 || col < 10) {
-                                sleep(interval);
+                                sleep_for_duration(interval);
                                 continue;
                         }
                         if (col > LINE_BUF_SIZE - 2)
@@ -1254,7 +1256,7 @@ int top_main(int argc UNUSED_PARAM, char **argv)
                         break;
 #if !ENABLE_FEATURE_TOP_INTERACTIVE
                 clearmems();
-                sleep(interval);
+                sleep_for_duration(interval);
 #else
                 new_mask = handle_input(scan_mask, interval);
                 if (new_mask == NO_RESCAN_MASK)
diff --git a/procps/uptime.c b/procps/uptime.c
index b0ee8391b..3262f41b4 100644
--- a/procps/uptime.c
+++ b/procps/uptime.c
@@ -45,7 +45,6 @@
 # include <sys/sysinfo.h>
 #endif
 
-
 #ifndef FSHIFT
 # define FSHIFT 16              /* nr of bits of precision */
 #endif
@@ -53,29 +52,48 @@
 #define LOAD_INT(x)  (unsigned)((x) >> FSHIFT)
 #define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1 - 1)) * 100)
 
-
 int uptime_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int uptime_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 {
         unsigned updays, uphours, upminutes;
+        unsigned opts;
         struct sysinfo info;
         struct tm *current_time;
         time_t current_secs;
 
+        opts = getopt32(argv, "s");
+
         time(&current_secs);
+        sysinfo(&info);
+
+        if (opts) // -s
+                current_secs -= info.uptime;
+
         current_time = localtime(&current_secs);
 
-        sysinfo(&info);
+        if (opts) { // -s
+                printf("%04u-%02u-%02u %02u:%02u:%02u\n",
+                        current_time->tm_year + 1900, current_time->tm_mon + 1, current_time->tm_mday,
+                        current_time->tm_hour, current_time->tm_min, current_time->tm_sec
+                );
+                /* The above way of calculating boot time is wobbly,
+                 * info.uptime has only 1 second precision, which makes
+                 * "uptime -s" wander +- one second.
+                 * /proc/uptime may be better, it has 0.01s precision.
+                 */
+                return EXIT_SUCCESS;
+        }
 
         printf(" %02u:%02u:%02u up ",
-                        current_time->tm_hour, current_time->tm_min, current_time->tm_sec);
+                        current_time->tm_hour, current_time->tm_min, current_time->tm_sec
+        );
         updays = (unsigned) info.uptime / (unsigned)(60*60*24);
-        if (updays)
+        if (updays != 0)
                 printf("%u day%s, ", updays, (updays != 1) ? "s" : "");
         upminutes = (unsigned) info.uptime / (unsigned)60;
         uphours = (upminutes / (unsigned)60) % (unsigned)24;
         upminutes %= 60;
-        if (uphours)
+        if (uphours != 0)
                 printf("%2u:%02u", uphours, upminutes);
         else
                 printf("%u min", upminutes);