circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-04-17 09:18:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2017-05-29 18:01:14 +01:00
commit d3959a2118
2 changed files with 16 additions and 0 deletions

9
format.c
View File

@ -22,6 +22,7 @@
#include <ctype.h> #include <ctype.h>
#include <errno.h> #include <errno.h>
#include <fnmatch.h>
#include <libgen.h> #include <libgen.h>
#include <netdb.h> #include <netdb.h>
#include <stdarg.h> #include <stdarg.h>
@ -885,6 +886,12 @@ format_replace(struct format_tree *ft, const char *key, size_t keylen,
/* Is there a length limit or whatnot? */ /* Is there a length limit or whatnot? */
switch (copy[0]) { switch (copy[0]) {
case 'm':
if (copy[1] != ':')
break;
compare = -2;
copy += 2;
break;
case '!': case '!':
if (copy[1] == '=' && copy[2] == ':') { if (copy[1] == '=' && copy[2] == ':') {
compare = -1; compare = -1;
@ -960,6 +967,8 @@ format_replace(struct format_tree *ft, const char *key, size_t keylen,
value = xstrdup("1"); value = xstrdup("1");
else if (compare == -1 && strcmp(left, right) != 0) else if (compare == -1 && strcmp(left, right) != 0)
value = xstrdup("1"); value = xstrdup("1");
else if (compare == -2 && fnmatch(left, right, 0) == 0)
value = xstrdup("1");
else else
value = xstrdup("0"); value = xstrdup("0");
free(right); free(right);

7
tmux.1
View File

@ -3448,6 +3448,13 @@ if running on
.Ql myhost , .Ql myhost ,
otherwise by otherwise by
.Ql 0. .Ql 0.
An
.Ql m
specifies a
.Xr fnmatch 3
comparison - the first argument is the pattern and the second the string to
compare. For example,
.Ql #{m:*foo*,#{host}} .
.Pp .Pp
A limit may be placed on the length of the resultant string by prefixing it A limit may be placed on the length of the resultant string by prefixing it
by an by an