circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-10-09 03:34:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/tmux-openbsd/master'

Browse Source 
* refs/remotes/tmux-openbsd/master:
  Copy all #s at once when multiple are seen before [ rather than only copying one at a time which can be very slow.
  Check time every iteration for expensive repeat loop.
This commit is contained in:
tmux update bot
2026-09-28 17:33:04 +00:00
parent 6ad23bb99c 5fbfaca6a8
commit 4bb0cc98d3
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
format.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: format.c,v 1.418 2026/09/20 08:19:31 nicm Exp $ */ /* $OpenBSD: format.c,v 1.420 2026/09/28 16:23:56 nicm Exp $ */
/* /*
* Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com> * Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -6027,7 +6027,7 @@ format_replace(struct format_expand_state *es, const char *key, size_t keylen,
struct format_modifier **sub = NULL, *mexp = NULL, *fm; struct format_modifier **sub = NULL, *mexp = NULL, *fm;
struct format_modifier *bool_op_n = NULL; struct format_modifier *bool_op_n = NULL;
u_int cycle_count = 1; u_int cycle_count = 1;
u_int i, count, nsub = 0, nrep, check = 0; u_int i, count, nsub = 0, nrep;
const char *loop_flags = ""; const char *loop_flags = "";
struct format_expand_state next; struct format_expand_state next;
struct environ_entry *envent; struct environ_entry *envent;
@@ -6428,7 +6428,7 @@ format_replace(struct format_expand_state *es, const char *key, size_t keylen,
else { else {
value = xstrdup(""); value = xstrdup("");
for (i = 0; i < nrep; i++) { for (i = 0; i < nrep; i++) {
if (!format_check_time(es, &check)) { if (!format_check_time(es, NULL)) {
free(right); free(right);
free(left); free(left);
free(value); free(value);
@@ -6824,6 +6824,19 @@ format_expand1(struct format_expand_state *es, const char *fmt)
fmt = ptr + 1; fmt = ptr + 1;
continue; continue;
} }
if (ch == '#') {
while (len - off < (n / 2) + 1) {
buf = xreallocarray(buf, 2, len);
len *= 2;
}
memset(buf + off, '#', n / 2);
off += (n / 2);
if (n % 2 != 0)
fmt = ptr - 1;
else
fmt = ptr;
continue;
}
/* FALLTHROUGH */ /* FALLTHROUGH */
case '}': case '}':
case ',': case ',':