Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/procps/watch.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/procps/watch.c (modified) (2 diffs)

branches/3.3/mindi-busybox/procps/watch.c

@@ -70 +70 @@
         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
-            get_terminal_width_height(STDERR_FILENO, &new_width, NULL);
+            new_width = get_terminal_width(STDERR_FILENO);
             if (new_width != width) {
                 width = new_width;
@@ -80 +79 @@
                 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