circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-01-07 16:28:48 +00:00
Code Issues Projects Releases Wiki Activity

Fix pretty time function to actually work and allow time format to be applied

Browse Source 
to any string that is suitable.
This commit is contained in:
Nicholas Marriott 2020-05-07 09:55:06 +01:00
parent 63e17d8cad
commit b0fa36734e
1 changed files with 62 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
format.c
View File

@ -1326,45 +1326,44 @@ static char *
format_pretty_time(time_t t) format_pretty_time(time_t t)
{ {
struct tm now_tm, tm; struct tm now_tm, tm;
time_t now; time_t now, age;
char s[6]; char s[6];
int y, m, d; int m;
time(&now); time(&now);
if (now < t) if (now < t)
now = t; now = t;
age = now - t;
localtime_r(&now, &now_tm); localtime_r(&now, &now_tm);
localtime_r(&t, &tm); localtime_r(&t, &tm);
y = now_tm.tm_year - 1; /* Last 24 hours. */
if (tm.tm_year < y || if (age < 24 * 3600) {
(tm.tm_year == y && strftime(s, sizeof s, "%H:%M", &tm);
(tm.tm_mon <= now_tm.tm_mon || tm.tm_mday <= now_tm.tm_mday))) {
/* Last year. */
strftime(s, sizeof s, "%h%y", &tm);
return (xstrdup(s)); return (xstrdup(s));
} }
/* This month or last 28 days. */
if ((tm.tm_year == now_tm.tm_year && tm.tm_mon == now_tm.tm_mon) ||
age < 28 * 24 * 3600) {
strftime(s, sizeof s, "%a%d", &tm);
return (xstrdup(s));
}
/* Last 12 months. */
if (now_tm.tm_mon == 0) if (now_tm.tm_mon == 0)
m = 11; m = 11;
else else
m = now_tm.tm_mon - 1; m = now_tm.tm_mon - 1;
if (tm.tm_mon < m || (tm.tm_mon == m && tm.tm_mday < now_tm.tm_mday)) { if ((tm.tm_year == now_tm.tm_year && tm.tm_mon < now_tm.tm_mon) ||
/* Last month. */ (tm.tm_year == now_tm.tm_year - 1 && tm.tm_mon > now_tm.tm_mon)) {
strftime(s, sizeof s, "%d%b", &tm); strftime(s, sizeof s, "%d%b", &tm);
return (xstrdup(s)); return (xstrdup(s));
} }
if (now_tm.tm_mday == 0)
d = 31; /* Older than that. */
else strftime(s, sizeof s, "%h%y", &tm);
d = now_tm.tm_mday - 1;
if (tm.tm_mday < d ||
(tm.tm_mday == d && tm.tm_mday < now_tm.tm_mday)) {
/* This day. */
strftime(s, sizeof s, "%a%d", &tm);
return (xstrdup(s));
}
/* Today. */
strftime(s, sizeof s, "%H:%M", &tm);
return (xstrdup(s)); return (xstrdup(s));
} }
@ -1377,44 +1376,31 @@ format_find(struct format_tree *ft, const char *key, int modifiers)
static char s[64]; static char s[64];
struct options_entry *o; struct options_entry *o;
int idx; int idx;
char *found, *saved; char *found = NULL, *saved;
const char *errstr;
time_t t = 0;
if (~modifiers & FORMAT_TIMESTRING) { o = options_parse_get(global_options, key, &idx, 0);
o = options_parse_get(global_options, key, &idx, 0); if (o == NULL && ft->wp != NULL)
if (o == NULL && ft->wp != NULL) o = options_parse_get(ft->wp->options, key, &idx, 0);
o = options_parse_get(ft->wp->options, key, &idx, 0); if (o == NULL && ft->w != NULL)
if (o == NULL && ft->w != NULL) o = options_parse_get(ft->w->options, key, &idx, 0);
o = options_parse_get(ft->w->options, key, &idx, 0); if (o == NULL)
if (o == NULL) o = options_parse_get(global_w_options, key, &idx, 0);
o = options_parse_get(global_w_options, key, &idx, 0); if (o == NULL && ft->s != NULL)
if (o == NULL && ft->s != NULL) o = options_parse_get(ft->s->options, key, &idx, 0);
o = options_parse_get(ft->s->options, key, &idx, 0); if (o == NULL)
if (o == NULL) o = options_parse_get(global_s_options, key, &idx, 0);
o = options_parse_get(global_s_options, key, &idx, 0); if (o != NULL) {
if (o != NULL) { found = options_tostring(o, idx, 1);
found = options_tostring(o, idx, 1); goto found;
goto found;
}
} }
found = NULL;
fe_find.key = (char *) key; fe_find.key = (char *)key;
fe = RB_FIND(format_entry_tree, &ft->tree, &fe_find); fe = RB_FIND(format_entry_tree, &ft->tree, &fe_find);
if (fe != NULL) { if (fe != NULL) {
if (modifiers & FORMAT_TIMESTRING) {
if (fe->t == 0)
return (NULL);
if (modifiers & FORMAT_PRETTY)
found = format_pretty_time(fe->t);
else {
ctime_r(&fe->t, s);
s[strcspn(s, "\n")] = '\0';
found = xstrdup(s);
}
goto found;
}
if (fe->t != 0) { if (fe->t != 0) {
xasprintf(&found, "%lld", (long long)fe->t); t = fe->t;
goto found; goto found;
} }
if (fe->value == NULL && fe->cb != NULL) if (fe->value == NULL && fe->cb != NULL)
@ -1440,7 +1426,28 @@ format_find(struct format_tree *ft, const char *key, int modifiers)
return (NULL); return (NULL);
found: found:
if (found == NULL) if (modifiers & FORMAT_TIMESTRING) {
if (t == 0 && found != NULL) {
t = strtonum(found, 0, INT64_MAX, &errstr);
if (errstr != NULL)
t = 0;
free(found);
}
if (t == 0)
return (NULL);
if (modifiers & FORMAT_PRETTY)
found = format_pretty_time(t);
else {
ctime_r(&t, s);
s[strcspn(s, "\n")] = '\0';
found = xstrdup(s);
}
return (found);
}
if (t != 0)
xasprintf(&found, "%lld", (long long)t);
else if (found == NULL)
return (NULL); return (NULL);
if (modifiers & FORMAT_BASENAME) { if (modifiers & FORMAT_BASENAME) {
saved = found; saved = found;