Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/coreutils/date.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/coreutils/date.c (modified) (3 diffs)

branches/3.3/mindi-busybox/coreutils/date.c

@@ -139 +139 @@
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 #if ENABLE_FEATURE_DATE_NANO
 # include <sys/syscall.h>
@@ -369 +370 @@
 
 #define date_buf bb_common_bufsiz1
+    setup_common_bufsiz();
     if (*fmt_dt2str == '\0') {
         /* With no format string, just print a blank line */
@@ -374 +376 @@
     } else {
         /* Handle special conversions */
-        if (strncmp(fmt_dt2str, "%f", 2) == 0) {
+        if (is_prefixed_with(fmt_dt2str, "%f")) {
             fmt_dt2str = (char*)"%Y.%m.%d-%H:%M:%S";
         }
         /* Generate output string */
-        strftime(date_buf, sizeof(date_buf), fmt_dt2str, &tm_time);
+        strftime(date_buf, COMMON_BUFSIZE, fmt_dt2str, &tm_time);
     }
     puts(date_buf);