diff options
| author |   nicm <nicm@openbsd.org> | 2020-04-01 08:07:05 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2020-04-01 08:07:05 +0000 |
| commit | c0239fbec1a3c90ae808790a14a26f052fbb19df (patch) | |
| tree | f13996ba0633a96011294327dfcdd2897f3ffbaf | |
| parent | Use a comparison to check for wrap and avoid an expensive modulus. (diff) | |
| download | wireguard-openbsd-c0239fbec1a3c90ae808790a14a26f052fbb19df.tar.xz wireguard-openbsd-c0239fbec1a3c90ae808790a14a26f052fbb19df.zip | |
Do not go down the regex search path (which is expensive because we need
to convert the grid data into a string for regexec and reverse it to
find the grid position) if the search string does not contain any regex
special characters.
| -rw-r--r-- | usr.bin/tmux/window-copy.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/usr.bin/tmux/window-copy.c b/usr.bin/tmux/window-copy.c index 4ccf29ee479..e59e0a252a3 100644 --- a/usr.bin/tmux/window-copy.c +++ b/usr.bin/tmux/window-copy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: window-copy.c,v 1.261 2020/04/01 07:52:07 nicm Exp $ */ +/* $OpenBSD: window-copy.c,v 1.262 2020/04/01 08:07:05 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -2714,23 +2714,27 @@ window_copy_search(struct window_mode_entry *wme, int direction, int regex) struct screen *s = data->backing, ss; struct screen_write_ctx ctx; struct grid *gd = s->grid; + const char *str = data->searchstr; u_int fx, fy, endline; int wrapflag, cis, found; + if (regex && str[strcspn(str, "^$*+()?[].\\")] == '\0') + regex = 0; + free(wp->searchstr); - wp->searchstr = xstrdup(data->searchstr); + wp->searchstr = xstrdup(str); wp->searchregex = regex; fx = data->cx; fy = screen_hsize(data->backing) - data->oy + data->cy; - screen_init(&ss, screen_write_strlen("%s", data->searchstr), 1, 0); + screen_init(&ss, screen_write_strlen("%s", str), 1, 0); screen_write_start(&ctx, NULL, &ss); - screen_write_nputs(&ctx, -1, &grid_default_cell, "%s", data->searchstr); + screen_write_nputs(&ctx, -1, &grid_default_cell, "%s", str); screen_write_stop(&ctx); wrapflag = options_get_number(wp->window->options, "wrap-search"); - cis = window_copy_is_lowercase(data->searchstr); + cis = window_copy_is_lowercase(str); if (direction) { window_copy_move_right(s, &fx, &fy, wrapflag); |