circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-10-11 21:14:21 +00:00
Code Issues Projects Releases Wiki Activity

Do not format times that localtime_r and ctime_r cannot convert, from

Browse Source 
Alexandre Fiori.

(cherry picked from commit c34432980f)
This commit is contained in:
nicm
2026-09-29 13:59:10 +00:00
committed by Nicholas Marriott
parent 6c11f706a3
commit 324ac927d6
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
format.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: format.c,v 1.422 2026/09/29 11:57:28 nicm Exp $ */ /* $OpenBSD: format.c,v 1.423 2026/09/29 13:59:10 nicm Exp $ */
/* /*
* Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com> * Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -4523,8 +4523,8 @@ format_pretty_time(time_t t, int seconds)
now = t; now = t;
age = now - t; age = now - t;
localtime_r(&now, &now_tm); if (localtime_r(&now, &now_tm) == NULL || localtime_r(&t, &tm) == NULL)
localtime_r(&t, &tm); return (xstrdup(""));
/* Last 24 hours. */ /* Last 24 hours. */
if (age < 24 * 3600) { if (age < 24 * 3600) {
@@ -4695,10 +4695,12 @@ found:
found = format_pretty_time(t, 0); found = format_pretty_time(t, 0);
else { else {
if (time_format != NULL) { if (time_format != NULL) {
localtime_r(&t, &tm); if (localtime_r(&t, &tm) == NULL)
return (NULL);
format_strftime(s, sizeof s, time_format, &tm); format_strftime(s, sizeof s, time_format, &tm);
} else { } else {
ctime_r(&t, s); if (ctime_r(&t, s) == NULL)
return (NULL);
s[strcspn(s, "\n")] = '\0'; s[strcspn(s, "\n")] = '\0';
} }
found = xstrdup(s); found = xstrdup(s);