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

Merge branch 'obsd-master' into master

Browse Source
This commit is contained in:
Thomas Adam
2021-02-22 10:01:22 +00:00
parent cb7e6698f3 5f425ee318
commit 0cd5ed9e9b
6 changed files with 121 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
format.c
View File

@@ -1412,6 +1412,26 @@ format_cb_client_written(struct format_tree *ft)
return (NULL);
}
/* Callback for config_files. */
static void *
format_cb_config_files(__unused struct format_tree *ft)
{
char *s = NULL;
size_t slen = 0;
u_int i;
size_t n;
for (i = 0; i < cfg_nfiles; i++) {
n = strlen(cfg_files[i]) + 1;
s = xrealloc(s, slen + n + 1);
slen += xsnprintf(s + slen, n + 1, "%s,", cfg_files[i]);
}
if (s == NULL)
return (xstrdup(""));
s[slen - 1] = '\0';
return (s);
}
/* Callback for cursor_flag. */
static void *
format_cb_cursor_flag(struct format_tree *ft)
@@ -2569,6 +2589,9 @@ static const struct format_table_entry format_table[] = {
{ "client_written", FORMAT_TABLE_STRING,
format_cb_client_written
},
{ "config_files", FORMAT_TABLE_STRING,
format_cb_config_files
},
{ "cursor_character", FORMAT_TABLE_STRING,
format_cb_cursor_character
},