Merge branch 'busybox' into merge

Conflicts:
	libbb/lineedit.c

1 files changed, 7 insertions, 5 deletions

diff --git a/procps/watch.c b/procps/watch.c
index 36af1cca7..0397f21bf 100644
--- a/procps/watch.c
+++ b/procps/watch.c
@@ -69,7 +69,6 @@ int watch_main(int argc UNUSED_PARAM, char **argv)
                 printf("\033[H""\033[J");
                 if (!(opt & 0x2)) { // no -t
                         const unsigned time_len = sizeof("1234-67-90 23:56:89");
-                        time_t t;
 
                         // STDERR_FILENO is procps3 compat:
                         // "watch ls 2>/dev/null" does not detect tty size
@@ -79,10 +78,13 @@ int watch_main(int argc UNUSED_PARAM, char **argv)
                                 free(header);
                                 header = xasprintf("Every %us: %-*s", period, (int)width, cmd);
                         }
-                        time(&t);
-                        if (time_len < width)
-                                strftime(header + width - time_len, time_len,
-                                        "%Y-%m-%d %H:%M:%S", localtime(&t));
+                        if (time_len < width) {
+                                strftime_YYYYMMDDHHMMSS(
+                                        header + width - time_len,
+                                        time_len,
+                                        /*time_t*:*/ NULL
+                                );
+                        }
 
                         // compat: empty line between header and cmd output
                         printf("%s\n\n", header);