traceroute: fix help text to not show -6 when traceroute6 is off

[oweals/busybox.git] / libbb / time.c

diff --git a/libbb/time.c b/libbb/time.c
index 0816022b92c4d7d125899aee00ab6a48d341cd63..85c72d163d45ca2fa23e714f7a80d40028bb8c15 100644 (file)
--- a/libbb/time.c
+++ b/libbb/time.c
@@ -66,7 +66,7 @@ void FAST_FUNC parse_datestr(const char *date_str, struct tm *tm_time)
                 * dd   Day, a number from 1 to 31
                 * HH   Hour, a number from 0 to 23
                 * MM   Minutes, a number from 0 to 59
-                * ss   Seconds, a number from 0 to 61 (with leap seconds)
+                * .SS  Seconds, a number from 0 to 61 (with leap seconds)
                 * Everything but the minutes is optional
                 *
                 * This coincides with the format of "touch -t TIME"
@@ -74,25 +74,25 @@ void FAST_FUNC parse_datestr(const char *date_str, struct tm *tm_time)
                int len = strchrnul(date_str, '.') - date_str;
 
                /* MM[.SS] */
-               if (len == 2 && sscanf(date_str, "%2u%2u%2u%2u%2u%c" + 12,
+               if (len == 2 && sscanf(date_str, "%2u%2u%2u%2u""%2u%c" + 12,
                                        &tm_time->tm_min,
                                        &end) >= 1) {
                } else
                /* HHMM[.SS] */
-               if (len == 4 && sscanf(date_str, "%2u%2u%2u%2u%2u%c" + 9,
+               if (len == 4 && sscanf(date_str, "%2u%2u%2u""%2u%2u%c" + 9,
                                        &tm_time->tm_hour,
                                        &tm_time->tm_min,
                                        &end) >= 2) {
                } else
                /* ddHHMM[.SS] */
-               if (len == 6 && sscanf(date_str, "%2u%2u%2u%2u%2u%c" + 6,
+               if (len == 6 && sscanf(date_str, "%2u%2u""%2u%2u%2u%c" + 6,
                                        &tm_time->tm_mday,
                                        &tm_time->tm_hour,
                                        &tm_time->tm_min,
                                        &end) >= 3) {
                } else
                /* mmddHHMM[.SS] */
-               if (len == 8 && sscanf(date_str, "%2u%2u%2u%2u%2u%c" + 3,
+               if (len == 8 && sscanf(date_str, "%2u""%2u%2u%2u%2u%c" + 3,
                                        &tm_time->tm_mon,
                                        &tm_time->tm_mday,
                                        &tm_time->tm_hour,
@@ -112,7 +112,7 @@ void FAST_FUNC parse_datestr(const char *date_str, struct tm *tm_time)
                        /* Adjust month from 1-12 to 0-11 */
                        tm_time->tm_mon -= 1;
                } else
-               /* yyyymmddHHMM[.SS] */
+               /* ccyymmddHHMM[.SS] */
                if (len == 12 && sscanf(date_str, "%4u%2u%2u%2u%2u%c",
                                        &tm_time->tm_year,
                                        &tm_time->tm_mon,