diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/dircolors.c | 3 | ||||
| -rw-r--r-- | src/dircolors.hin | 42 |
2 files changed, 9 insertions, 36 deletions
diff --git a/src/dircolors.c b/src/dircolors.c index 3a03f1f22..d0bd2e406 100644 --- a/src/dircolors.c +++ b/src/dircolors.c @@ -18,6 +18,7 @@ #include <config.h> #include <sys/types.h> +#include <fnmatch.h> #include <getopt.h> #include "system.h" @@ -293,7 +294,7 @@ dc_parse_stream (FILE *fp, const char *filename) unrecognized = false; if (c_strcasecmp (keywd, "TERM") == 0) { - if (STREQ (arg, term)) + if (fnmatch (arg, term, 0) == 0) state = ST_TERMSURE; else if (state != ST_TERMSURE) state = ST_TERMNO; diff --git a/src/dircolors.hin b/src/dircolors.hin index 5c894474c..e20fad536 100644 --- a/src/dircolors.hin +++ b/src/dircolors.hin @@ -8,20 +8,12 @@ # The keywords COLOR, OPTIONS, and EIGHTBIT (honored by the # slackware version of dircolors) are recognized but ignored. -# Below, there should be one TERM entry for each termtype that is colorizable +# Below are TERM entries, which can be a glob patterns, to match +# against the TERM environment variable to determine if it is colorizable. TERM Eterm TERM ansi TERM color-xterm -TERM con132x25 -TERM con132x30 -TERM con132x43 -TERM con132x60 -TERM con80x25 -TERM con80x28 -TERM con80x30 -TERM con80x43 -TERM con80x50 -TERM con80x60 +TERM con[0-9]*x[0-9]* TERM cons25 TERM console TERM cygwin @@ -40,34 +32,14 @@ TERM mach-gnu-color TERM mlterm TERM putty TERM putty-256color -TERM rxvt -TERM rxvt-256color -TERM rxvt-cygwin -TERM rxvt-cygwin-native -TERM rxvt-unicode -TERM rxvt-unicode-256color -TERM rxvt-unicode256 -TERM screen -TERM screen-256color -TERM screen-256color-bce -TERM screen-bce -TERM screen-w -TERM screen.Eterm -TERM screen.rxvt -TERM screen.linux +TERM rxvt* +TERM screen* TERM st TERM st-256color TERM terminator -TERM tmux -TERM tmux-256color +TERM tmux* TERM vt100 -TERM xterm -TERM xterm-16color -TERM xterm-256color -TERM xterm-88color -TERM xterm-color -TERM xterm-debian -TERM xterm-termite +TERM xterm* # Below are the color init strings for the basic file types. A color init # string consists of one or more of the following numeric codes: |