Add support for milliseconds formatted as %f in strptime(fmt).

docs/content/3.manual/manual.yml

@@ -1921,6 +1921,7 @@ sections:
           The `strptime(fmt)` builtin parses input strings matching the
           `fmt` argument.  The output is in the "broken down time"
           representation consumed by `gmtime` and output by `mktime`.
+          Milliseconds can be parsed by `strptime(fmt)` as %f in `fmt`.
 
           The `strftime(fmt)` builtin formats a time (GMT) with the
           given format.  The `strflocaltime` does the same, but using

src/builtin.c

@@ -1219,24 +1219,49 @@ static jv f_strptime(jq_state *jq, jv a, jv b) {
   memset(&tm, 0, sizeof(tm));
   const char *input = jv_string_value(a);
   const char *fmt = jv_string_value(b);
-  const char *end = strptime(input, fmt, &tm);
-
-  if (end == NULL || (*end != '\0' && !isspace(*end))) {
-    jv e = jv_invalid_with_msg(jv_string_fmt("date \"%s\" does not match format \"%s\"", input, fmt));
-    jv_free(a);
-    jv_free(b);
-    return e;
+  char *inputdup = strdup(input);
+  char *fmtdup = strdup(fmt);
+
+  int ms = -1;
+  char *pf = strstr(fmtdup, "%f");
+  if (pf) {
+    char *msfmtloc = pf - 1;
+    char delim = *msfmtloc;
+    *msfmtloc = '\0';
+    char *msloc = strrchr(inputdup, delim);
+    if (msloc == NULL)
+      goto bad_fmt_out;
+    *msloc = '\0';
+    ms = atoi(msloc + 1);
   }
+
+  const char *end = strptime(inputdup, fmtdup, &tm);
+
+  if (end == NULL || (*end != '\0' && !isspace(*end)))
+    goto bad_fmt_out;
+
+  free(inputdup);
+  free(fmtdup);
   jv_free(b);
   if (tm.tm_wday == 0 && tm.tm_yday == 0 && my_mktime(&tm) == (time_t)-2) {
     jv_free(a);
     return jv_invalid_with_msg(jv_string("strptime/1 not supported on this platform"));
   }
   jv r = tm2jv(&tm);
+  if (ms >= 0)
+    r = jv_array_append(r, jv_number(ms));
   if (*end != '\0')
     r = jv_array_append(r, jv_string(end));
   jv_free(a); // must come after `*end` because `end` is a pointer into `a`'s string
   return r;
+
+ bad_fmt_out:;
+  jv e = jv_invalid_with_msg(jv_string_fmt("date \"%s\" does not match format \"%s\"", input, fmt));
+  jv_free(a);
+  jv_free(b);
+  free(inputdup);
+  free(fmtdup);
+  return e;
 }
 #else
 static jv f_strptime(jq_state *jq, jv a, jv b) {

tests/optional.test

@@ -10,4 +10,6 @@ strftime("%A, %B %e, %Y")
 1435677542.822351
 "Tuesday, June 30, 2015"
 
-
+strptime("%Y+%m-%dT%H:%M:%S.%fZ")
+"2015+03-05T19:40:53.592Z"
+[2015,2,5,19,40,53,4,63,592]