circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-03-06 15:55:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2026-03-04 12:01:09 +00:00
parent 27698c468b 6d37cc94a7
commit d32088b58a
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cmd-confirm-before.c
View File

@@ -92,6 +92,7 @@ cmd_confirm_before_exec(struct cmd *self, struct cmdq_item *item)
cdata->confirm_key = confirm_key[0]; cdata->confirm_key = confirm_key[0];
else { else {
cmdq_error(item, "invalid confirm key"); cmdq_error(item, "invalid confirm key");
cmd_list_free(cdata->cmdlist);
free(cdata); free(cdata);
return (CMD_RETURN_ERROR); return (CMD_RETURN_ERROR);
} }

5
cmd-new-session.c
View File

@@ -117,8 +117,9 @@ cmd_new_session_exec(struct cmd *self, struct cmdq_item *item)
as = target->s; as = target->s;
if (as != NULL) { if (as != NULL) {
retval = cmd_attach_session(item, as->name, retval = cmd_attach_session(item, as->name,
args_has(args, 'D'), args_has(args, 'X'), 0, NULL, args_has(args, 'D'), args_has(args, 'X'), 0,
args_has(args, 'E'), args_get(args, 'f')); args_get(args, 'c'), args_has(args, 'E'),
args_get(args, 'f'));
free(newname); free(newname);
return (retval); return (retval);
} }

2
cmd-paste-buffer.c
View File

@@ -49,7 +49,7 @@ cmd_paste_buffer_paste(struct window_pane *wp, const char *buf, size_t len)
char *cp; char *cp;
size_t n; size_t n;
n = utf8_stravisx(&cp, buf, len, VIS_SAFE); n = utf8_stravisx(&cp, buf, len, VIS_SAFE|VIS_NOSLASH);
bufferevent_write(wp->event, cp, n); bufferevent_write(wp->event, cp, n);
free(cp); free(cp);
} }

2
cmd-send-keys.c
View File

@@ -168,7 +168,7 @@ cmd_send_keys_exec(struct cmd *self, struct cmdq_item *item)
u_int count = args_count(args); u_int count = args_count(args);
char *cause = NULL; char *cause = NULL;
if (tc->flags & CLIENT_READONLY && !args_has(args, 'X')) { if (tc != NULL && tc->flags & CLIENT_READONLY && !args_has(args, 'X')) {
cmdq_error(item, "client is read-only"); cmdq_error(item, "client is read-only");
return (CMD_RETURN_ERROR); return (CMD_RETURN_ERROR);
} }