mirrors/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-10-26 12:27:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2019-06-24 11:02:26 +01:00
parent 50c4c5917d bdab595095
commit c14b0d7c00
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
window.c
View File

@@ -19,6 +19,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <ctype.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <fnmatch.h> #include <fnmatch.h>
@@ -1223,6 +1224,7 @@ window_pane_search(struct window_pane *wp, const char *term, int regex,
char *new = NULL, *line; char *new = NULL, *line;
u_int i; u_int i;
int flags = 0, found; int flags = 0, found;
size_t n;
if (!regex) { if (!regex) {
if (ignore) if (ignore)
@@ -1237,6 +1239,12 @@ window_pane_search(struct window_pane *wp, const char *term, int regex,
for (i = 0; i < screen_size_y(s); i++) { for (i = 0; i < screen_size_y(s); i++) {
line = grid_view_string_cells(s->grid, 0, i, screen_size_x(s)); line = grid_view_string_cells(s->grid, 0, i, screen_size_x(s));
for (n = strlen(line); n > 0; n--) {
if (!isspace((u_char)line[n - 1]))
break;
line[n - 1] = '\0';
}
log_debug("%s: %s", __func__, line);
if (!regex) if (!regex)
found = (fnmatch(new, line, 0) == 0); found = (fnmatch(new, line, 0) == 0);
else else