extern/tmate
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate.git synced 2025-08-17 17:11:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Change find-window and monitor-content to use fnmatch(3). For convenience and

Browse Source 
compatibility, *s are implicitly added at the start and end of the pattern.
This commit is contained in:
Nicholas Marriott
2009-06-25 16:04:24 +00:00
parent 853ad68162
commit f7a9eb46fc
6 changed files with 43 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
window.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: window.c,v 1.4 2009/06/24 22:04:18 nicm Exp $ */
/* $OpenBSD: window.c,v 1.5 2009/06/24 22:49:56 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -21,6 +21,7 @@
#include <errno.h>
#include <fcntl.h>
#include <fnmatch.h>
#include <signal.h>
#include <stdint.h>
#include <stdlib.h>
@@ -602,23 +603,26 @@ window_pane_mouse(
}
char *
window_pane_search(struct window_pane *wp, const char *searchstr)
window_pane_search(struct window_pane *wp, const char *searchstr, u_int *lineno)
{
struct screen *s = &wp->base;
char *line, *ptr;
char *newsearchstr, *line, *msg;
u_int i;
ptr = NULL;
msg = NULL;
xasprintf(&newsearchstr, "*%s*", searchstr);
for (i = 0; i < screen_size_y(s); i++) {
line = grid_view_string_cells(s->grid, 0, i, screen_size_x(s));
log_debug("XXX %s", line);
if ((ptr = strstr(line, searchstr)) != NULL)
break;
if (fnmatch(newsearchstr, line, 0) == 0) {
msg = line;
if (lineno != NULL)
*lineno = i;
break;
}
xfree(line);
}
if (ptr != NULL) {
ptr = section_string(line, strlen(ptr), ptr - line, 40);
xfree(line);
}
return (ptr);
xfree(newsearchstr);
return (msg);
}