>From the "Fixes" file:
Don't crash with 'bindkey "^0" clear-screen' (Karl Jeacle) Fix $x:q:h and $x:q:t return the whole string for strings not containing /
diff --git a/shells/tcsh/Makefile b/shells/tcsh/Makefile index d178f13a6e9..b109f141950 100644 --- a/shells/tcsh/Makefile +++ b/shells/tcsh/Makefile @@ -2,7 +2,7 @@ COMMENT= extended C-shell with many useful features -DISTNAME= tcsh-6.22.03 +DISTNAME= tcsh-6.22.04 REVISION= 0 CATEGORIES= shells HOMEPAGE= http://www.tcsh.org/ diff --git a/shells/tcsh/distinfo b/shells/tcsh/distinfo index 7d18689ea83..e63de9b2663 100644 --- a/shells/tcsh/distinfo +++ b/shells/tcsh/distinfo @@ -1,2 +1,2 @@ -SHA256 (tcsh-6.22.03.tar.gz) = viz9ZT0qDH9QbS3RTBIyS6dJvUhAN75t9Eo5c/UiYrc= -SIZE (tcsh-6.22.03.tar.gz) = 1012758 +SHA256 (tcsh-6.22.04.tar.gz) = 6xY1YkMhjDLzngcljXK/iyHmLOlLsOipXjGLFROX4jE= +SIZE (tcsh-6.22.04.tar.gz) = 1012977 diff --git a/shells/tcsh/patches/patch-sh_lex_c b/shells/tcsh/patches/patch-sh_lex_c deleted file mode 100644 index 4f21b6fd717..00000000000 --- a/shells/tcsh/patches/patch-sh_lex_c +++ /dev/null @@ -1,17 +0,0 @@ -$OpenBSD: patch-sh_lex_c,v 1.1 2021/03/27 16:54:23 naddy Exp $ - -Restore the behavior where both $foo:h and $foo:t return the whole string -https://github.com/tcsh-org/tcsh/commit/05d3d6bfc22462584f9347493499621056995ac1 - -Index: sh.lex.c ---- sh.lex.c.orig -+++ sh.lex.c -@@ -1046,7 +1046,7 @@ domod(Char *cp, Char type) - case 't': - wp = Strrchr(cp, '/'); - if (wp == NULL) -- return Strsave(type == 't' ? cp : STRNULL); -+ return NULL; - if (type == 't') - xp = Strsave(wp + 1); - else diff --git a/shells/tcsh/patches/patch-tests_lexical_at b/shells/tcsh/patches/patch-tests_lexical_at deleted file mode 100644 index 0d5a1a88019..00000000000 --- a/shells/tcsh/patches/patch-tests_lexical_at +++ /dev/null @@ -1,26 +0,0 @@ -$OpenBSD: patch-tests_lexical_at,v 1.1 2021/03/27 16:54:23 naddy Exp $ - -Restore the behavior where both $foo:h and $foo:t return the whole string -https://github.com/tcsh-org/tcsh/commit/05d3d6bfc22462584f9347493499621056995ac1 - -Index: tests/lexical.at ---- tests/lexical.at.orig -+++ tests/lexical.at -@@ -677,7 +677,7 @@ AT_CHECK([tcsh -f colon_r_no_extension.csh], 0, - - AT_CLEANUP - --AT_SETUP([$x:q:h does not cause out of memory crash and yields nothing]) -+AT_SETUP([$x:q:h does not cause out of memory crash and yields the full string]) - - AT_DATA([x_colon_q_colon_h.csh], - [[set x='a/b c/d.e' -@@ -686,7 +686,7 @@ exit 0 - ]]) - - AT_CHECK([tcsh -f x_colon_q_colon_h.csh], 0, --[ -+[a/b c/d.e - ]) - - AT_CLEANUP
