diff options
author | nicm <nicm> | 2023-02-06 09:20:30 +0000 |
---|---|---|
committer | nicm <nicm> | 2023-02-06 09:20:30 +0000 |
commit | 7acc8d703dec9f02e072ebc95495d634868b62e4 (patch) | |
tree | ecc6e7b124f1a3c8254fbec9daa043054183425b /cmd-list-clients.c | |
parent | 0cb75f1332f7d2b5a3c610c2d76c5c53ef129c7c (diff) |
Add -f to list-clients like the other list commands, from Andy Walker in
GitHub issue 3449.
Diffstat (limited to 'cmd-list-clients.c')
-rw-r--r-- | cmd-list-clients.c | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/cmd-list-clients.c b/cmd-list-clients.c index 53a99178..da7541bc 100644 --- a/cmd-list-clients.c +++ b/cmd-list-clients.c @@ -41,8 +41,8 @@ const struct cmd_entry cmd_list_clients_entry = { .name = "list-clients", .alias = "lsc", - .args = { "F:t:", 0, 0, NULL }, - .usage = "[-F format] " CMD_TARGET_SESSION_USAGE, + .args = { "F:f:t:", 0, 0, NULL }, + .usage = "[-F format] [-f filter] " CMD_TARGET_SESSION_USAGE, .target = { 't', CMD_FIND_SESSION, 0 }, @@ -58,9 +58,10 @@ cmd_list_clients_exec(struct cmd *self, struct cmdq_item *item) struct client *c; struct session *s; struct format_tree *ft; - const char *template; + const char *template, *filter; u_int idx; - char *line; + char *line, *expanded; + int flag; if (args_has(args, 't')) s = target->s; @@ -69,6 +70,7 @@ cmd_list_clients_exec(struct cmd *self, struct cmdq_item *item) if ((template = args_get(args, 'F')) == NULL) template = LIST_CLIENTS_TEMPLATE; + filter = args_get(args, 'f'); idx = 0; TAILQ_FOREACH(c, &clients, entry) { @@ -79,9 +81,17 @@ cmd_list_clients_exec(struct cmd *self, struct cmdq_item *item) format_add(ft, "line", "%u", idx); format_defaults(ft, c, NULL, NULL, NULL); - line = format_expand(ft, template); - cmdq_print(item, "%s", line); - free(line); + if (filter != NULL) { + expanded = format_expand(ft, filter); + flag = format_true(expanded); + free(expanded); + } else + flag = 1; + if (flag) { + line = format_expand(ft, template); + cmdq_print(item, "%s", line); + free(line); + } format_free(ft); |