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

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2025-08-22 10:01:08 +01:00
parent f4c0fe2ede 7325da3052
commit a5909b450c
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmd-switch-client.c
View File

@ -61,7 +61,8 @@ cmd_switch_client_exec(struct cmd *self, struct cmdq_item *item)
const char *tablename; const char *tablename;
struct key_table *table; struct key_table *table;
if (tflag != NULL && tflag[strcspn(tflag, ":.%")] != '\0') { if (tflag != NULL &&
(tflag[strcspn(tflag, ":.%")] != '\0' || strcmp(tflag, "=") == 0)) {
type = CMD_FIND_PANE; type = CMD_FIND_PANE;
flags = 0; flags = 0;
} else { } else {

6
server-client.c
View File

@ -3442,7 +3442,7 @@ server_client_dispatch_command(struct client *c, struct imsg *imsg)
struct msg_command data; struct msg_command data;
char *buf; char *buf;
size_t len; size_t len;
int argc; int argc = 0;
char **argv, *cause; char **argv, *cause;
struct cmd_parse_result *pr; struct cmd_parse_result *pr;
struct args_value *values; struct args_value *values;
@ -3461,12 +3461,12 @@ server_client_dispatch_command(struct client *c, struct imsg *imsg)
if (len > 0 && buf[len - 1] != '\0') if (len > 0 && buf[len - 1] != '\0')
fatalx("bad MSG_COMMAND string"); fatalx("bad MSG_COMMAND string");
argc = data.argc; if (cmd_unpack_argv(buf, len, data.argc, &argv) != 0) {
if (cmd_unpack_argv(buf, len, argc, &argv) != 0) {
cause = xstrdup("command too long"); cause = xstrdup("command too long");
goto error; goto error;
} }
argc = data.argc;
if (argc == 0) { if (argc == 0) {
cmdlist = cmd_list_copy(options_get_command(global_options, cmdlist = cmd_list_copy(options_get_command(global_options,
"default-client-command"), 0, NULL); "default-client-command"), 0, NULL);

4
window-tree.c
View File

@ -657,8 +657,10 @@ window_tree_draw_session(struct window_tree_modedata *data, struct session *s,
screen_write_preview(ctx, &w->active->base, width, sy); screen_write_preview(ctx, &w->active->base, width, sy);
xasprintf(&label, " %u:%s ", wl->idx, w->name); xasprintf(&label, " %u:%s ", wl->idx, w->name);
if (strlen(label) > width) if (strlen(label) > width) {
free(label);
xasprintf(&label, " %u ", wl->idx); xasprintf(&label, " %u ", wl->idx);
}
window_tree_draw_label(ctx, cx + offset, cy, width, sy, &gc, window_tree_draw_label(ctx, cx + offset, cy, width, sy, &gc,
label); label);
free(label); free(label);