diff --git a/tcsh-6.18.03-colorls.dif b/tcsh-6.18.03-colorls.dif index 00a6785..92671b7 100644 --- a/tcsh-6.18.03-colorls.dif +++ b/tcsh-6.18.03-colorls.dif @@ -1,9 +1,76 @@ --- - tw.color.c | 10 ++++------ - 1 file changed, 4 insertions(+), 6 deletions(-) + tests/ls-F.at | 36 ++++++++++++++++++------------------ + tw.color.c | 10 ++++------ + 2 files changed, 22 insertions(+), 24 deletions(-) +--- tests/ls-F.at ++++ tests/ls-F.at 2023-04-13 12:51:33.133052023 +0000 +@@ -358,9 +358,9 @@ dnl + dnl Fail: environment LS_COLORS=YY:XX=0 exits with unknown 'XX'. + dnl (Unknown 'YY' is ignored.) + dnl +-AT_CHECK([LS_COLORS=YY:XX=0 tcsh -f -c 'set color;cd DIR && ls-F'], [1], [], [dnl +-Unknown LS_COLORS color variable 'XX'. +-]) ++dnl AT_CHECK([LS_COLORS=YY:XX=0 tcsh -f -c 'set color;cd DIR && ls-F'], [1], [], [dnl ++dnl Unknown LS_COLORS color variable 'XX'. ++dnl ]) + + dnl + dnl setenv LS_COLORS "YY:XX=0" warns for unknown 'XX='. (Unknown 'YY' is ignored'). +@@ -368,11 +368,11 @@ dnl listflags=A, listlinks + dnl + dnl As per ls-F-color-default.out. + dnl +-TCSH_LS_F([${tests_dir}/ls-F-color-default.out], +- [], +- [setenv LS_COLORS "YY:XX=0"; set color listflags=A listlinks], [dnl +-Unknown LS_COLORS color variable 'XX'. +-]) ++dnl TCSH_LS_F([${tests_dir}/ls-F-color-default.out], ++dnl [], ++dnl [setenv LS_COLORS "YY:XX=0"; set color listflags=A listlinks], [dnl ++dnl Unknown LS_COLORS color variable 'XX'. ++dnl ]) + + dnl + dnl Check setenv LS_COLORS that all variables before an unknown variable are used. +@@ -383,11 +383,11 @@ dnl listflags=A, listlinks + dnl + dnl As per ls-F-LS_COLORS-all.out. + dnl +-TCSH_LS_F([${tests_dir}/ls-F-LS_COLORS-all.out], +- [], +- [setenv LS_COLORS "TCSH_TEXT_LS_COLORS:YY:XX=0"; set color listflags=A listlinks], [dnl +-Unknown LS_COLORS color variable 'XX'. +-]) ++dnl TCSH_LS_F([${tests_dir}/ls-F-LS_COLORS-all.out], ++dnl [], ++dnl [setenv LS_COLORS "TCSH_TEXT_LS_COLORS:YY:XX=0"; set color listflags=A listlinks], [dnl ++dnl Unknown LS_COLORS color variable 'XX'. ++dnl ]) + + dnl + dnl LS_COLORS as TCSH_TEXT_LS_COLORS, override with setenv LSCOLORS, +@@ -407,11 +407,11 @@ dnl override with LSCOLORS=Aa, + dnl then unsetenv LSCOLORS to reapply faulty LS_COLORS without warning. + dnl and results in default colors. + dnl +-TCSH_LS_F([${tests_dir}/ls-F-color-default.out], +- [], +- [setenv LS_COLORS XX=0; setenv LSCOLORS Aa; unsetenv LSCOLORS || echo FAIL; set color listflags=A listlinks], [dnl +-Unknown LS_COLORS color variable 'XX'. +-]) ++dnl TCSH_LS_F([${tests_dir}/ls-F-color-default.out], ++dnl [], ++dnl [setenv LS_COLORS XX=0; setenv LSCOLORS Aa; unsetenv LSCOLORS || echo FAIL; set color listflags=A listlinks], [dnl ++dnl Unknown LS_COLORS color variable 'XX'. ++dnl ]) + + m4_popdef([TCSH_TEXT_LS_COLORS]) + --- tw.color.c -+++ tw.color.c 2023-04-13 12:32:43.646160772 +0000 ++++ tw.color.c 2023-04-13 12:33:48.052952714 +0000 @@ -56,7 +56,7 @@ typedef struct { typedef enum { Vdi, Vln, Vor, Vpi, Vso, Vdo, Vbd, Vcd, diff --git a/tcsh.changes b/tcsh.changes index d21bd03..0f063f4 100644 --- a/tcsh.changes +++ b/tcsh.changes @@ -6,6 +6,8 @@ Thu Apr 13 12:34:15 UTC 2023 - Dr. Werner Fink * Don't crash if LSCOLORS contains > 11 pairs (Luke Mewburn) - Port patch * tcsh-6.18.03-colorls.dif + that is we ignore unknown colors to be compatible with LS_COLOR + used by /usr/bin/ls from coreutils ------------------------------------------------------------------- Tue Apr 11 09:52:13 UTC 2023 - Dr. Werner Fink