circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2024-05-15 12:01:10 +01:00
parent 452d987e0e bfd65398a9
commit 4fd725c6e1
2 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
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");
free(cdata);
return (CMD_RETURN_ERROR); return (CMD_RETURN_ERROR);
} }
} }
@ -102,8 +103,8 @@ cmd_confirm_before_exec(struct cmd *self, struct cmdq_item *item)
xasprintf(&new_prompt, "%s ", prompt); xasprintf(&new_prompt, "%s ", prompt);
else { else {
cmd = cmd_get_entry(cmd_list_first(cdata->cmdlist))->name; cmd = cmd_get_entry(cmd_list_first(cdata->cmdlist))->name;
xasprintf(&new_prompt, "Confirm '%s'? (%c/n) ", xasprintf(&new_prompt, "Confirm '%s'? (%c/n) ", cmd,
cmd, cdata->confirm_key); cdata->confirm_key);
} }
status_prompt_set(tc, target, new_prompt, NULL, status_prompt_set(tc, target, new_prompt, NULL,

40
status.c
View File

@ -994,8 +994,7 @@ status_prompt_paste(struct client *c)
if ((pb = paste_get_top(NULL)) == NULL) if ((pb = paste_get_top(NULL)) == NULL)
return (0); return (0);
bufdata = paste_buffer_data(pb, &bufsize); bufdata = paste_buffer_data(pb, &bufsize);
ud = xreallocarray(NULL, bufsize + 1, sizeof *ud); ud = udp = xreallocarray(NULL, bufsize + 1, sizeof *ud);
udp = ud;
for (i = 0; i != bufsize; /* nothing */) { for (i = 0; i != bufsize; /* nothing */) {
more = utf8_open(udp, bufdata[i]); more = utf8_open(udp, bufdata[i]);
if (more == UTF8_MORE) { if (more == UTF8_MORE) {
@ -1016,25 +1015,24 @@ status_prompt_paste(struct client *c)
udp->size = 0; udp->size = 0;
n = udp - ud; n = udp - ud;
} }
if (n == 0) if (n != 0) {
return (0); c->prompt_buffer = xreallocarray(c->prompt_buffer, size + n + 1,
sizeof *c->prompt_buffer);
c->prompt_buffer = xreallocarray(c->prompt_buffer, size + n + 1, if (c->prompt_index == size) {
sizeof *c->prompt_buffer); memcpy(c->prompt_buffer + c->prompt_index, ud,
if (c->prompt_index == size) { n * sizeof *c->prompt_buffer);
memcpy(c->prompt_buffer + c->prompt_index, ud, c->prompt_index += n;
n * sizeof *c->prompt_buffer); c->prompt_buffer[c->prompt_index].size = 0;
c->prompt_index += n; } else {
c->prompt_buffer[c->prompt_index].size = 0; memmove(c->prompt_buffer + c->prompt_index + n,
} else { c->prompt_buffer + c->prompt_index,
memmove(c->prompt_buffer + c->prompt_index + n, (size + 1 - c->prompt_index) *
c->prompt_buffer + c->prompt_index, sizeof *c->prompt_buffer);
(size + 1 - c->prompt_index) * sizeof *c->prompt_buffer); memcpy(c->prompt_buffer + c->prompt_index, ud,
memcpy(c->prompt_buffer + c->prompt_index, ud, n * sizeof *c->prompt_buffer);
n * sizeof *c->prompt_buffer); c->prompt_index += n;
c->prompt_index += n; }
} }
if (ud != c->prompt_saved) if (ud != c->prompt_saved)
free(ud); free(ud);
return (1); return (1);
@ -1839,6 +1837,7 @@ status_prompt_complete_window_menu(struct client *c, struct session *s,
} }
if (size == 0) { if (size == 0) {
menu_free(menu); menu_free(menu);
free(spm);
return (NULL); return (NULL);
} }
if (size == 1) { if (size == 1) {
@ -1849,6 +1848,7 @@ status_prompt_complete_window_menu(struct client *c, struct session *s,
} else } else
tmp = list[0]; tmp = list[0];
free(list); free(list);
free(spm);
return (tmp); return (tmp);
} }
if (height > size) if (height > size)