Upstream: strftime differences cause abort()

andrewc12 · Oct 6, 2022 · aac5105 · aac5105
1 parent 807bdf5
commit aac5105
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/lib/libzfs/libzfs_dataset.c b/lib/libzfs/libzfs_dataset.c
@@ -2647,7 +2647,12 @@ zfs_prop_get(zfs_handle_t *zhp, zfs_prop_t prop, char *propbuf, size_t proplen,
 
 			if (literal ||
 			    localtime_r(&time, &t) == NULL ||
-			    strftime(propbuf, proplen, "%a %b %e %k:%M %Y",
+			    strftime(propbuf, proplen,
+#ifdef _WIN32
+			    "%a %b %d %H:%M %Y",
+#else
+			    "%a %b %e %k:%M %Y",
+#endif
 			    &t) == 0)
 				(void) snprintf(propbuf, proplen, "%llu",
 				    (u_longlong_t)val);