Fix locale-specific time

openzfs · Feb 10, 2024 · 8741d66 · 8741d66
1 parent 79c6dff
commit 8741d66
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/cmd/zpool/zpool_main.c b/cmd/zpool/zpool_main.c
@@ -2307,19 +2307,22 @@ print_status_trim(vdev_stat_t *vs, boolean_t verbose)
 			}
 
 			(void) localtime_r(&t, &zaction_ts);
-			(void) strftime(tbuf, sizeof (tbuf), "%c", &zaction_ts);
+			(void) ctime_r(&t, tbuf);
 
 			switch (vs->vs_trim_state) {
 			case VDEV_TRIM_SUSPENDED:
-				(void) snprintf(zbuf, sizeof (zbuf), ", %s %s",
+				(void) snprintf(zbuf, sizeof (zbuf),
+				    ", %s %.24s",
 				    gettext("suspended, started at"), tbuf);
 				break;
 			case VDEV_TRIM_ACTIVE:
-				(void) snprintf(zbuf, sizeof (zbuf), ", %s %s",
+				(void) snprintf(zbuf, sizeof (zbuf),
+				    ", %s %.24s",
 				    gettext("started at"), tbuf);
 				break;
 			case VDEV_TRIM_COMPLETE:
-				(void) snprintf(zbuf, sizeof (zbuf), ", %s %s",
+				(void) snprintf(zbuf, sizeof (zbuf),
+				    ", %s %.24s",
 				    gettext("completed at"), tbuf);
 				break;
 			}