From faf2c833580cb0291d0dfea7d8a359cf2015a406 Mon Sep 17 00:00:00 2001 From: Miloslav Trmac Date: Fri, 5 Aug 2005 14:46:39 +0000 Subject: [PATCH] - Fix EOF handling in $< (#165095) --- tcsh-6.14.00-read.patch | 16 ++++++++++++++++ tcsh.spec | 7 ++++++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 tcsh-6.14.00-read.patch diff --git a/tcsh-6.14.00-read.patch b/tcsh-6.14.00-read.patch new file mode 100644 index 0000000..3a0b5ee --- /dev/null +++ b/tcsh-6.14.00-read.patch @@ -0,0 +1,16 @@ +Index: tcsh/sh.dol.c +=================================================================== +--- tcsh.orig/sh.dol.c ++++ tcsh/sh.dol.c +@@ -485,9 +485,10 @@ Dgetdol(void) + (void) sigrelse(SIGINT); + #endif /* BSDSIGS */ + np = wbuf; +- while (force_read(OLDSTD, cbuf + cbp++, 1) == 1) { ++ while (force_read(OLDSTD, cbuf + cbp, 1) == 1) { + int len; + ++ cbp++; + len = normal_mbtowc(np, cbuf, cbp); + if (len == -1) { + reset_mbtowc(); diff --git a/tcsh.spec b/tcsh.spec index 2e7e48c..9eca830 100644 --- a/tcsh.spec +++ b/tcsh.spec @@ -3,7 +3,7 @@ Summary: An enhanced version of csh, the C shell. Name: tcsh Version: 6.14 -Release: 3 +Release: 4 License: distributable Group: System Environment/Shells Source: ftp://ftp.astron.com/pub/tcsh/tcsh-%{version}.00.tar.gz @@ -12,6 +12,7 @@ Patch1: tcsh-6.14.00-closem.patch Patch2: tcsh-6.14.00-iconv.patch Patch3: tcsh-6.14.00-lsF.patch Patch4: tcsh-6.14.00-dashn.patch +Patch5: tcsh-6.14.00-read.patch Provides: csh = %{version} Prereq: fileutils, grep URL: http://www.tcsh.org/ @@ -33,6 +34,7 @@ like syntax. %patch2 -p1 -b .iconv %patch3 -p1 -b .lsF %patch4 -p1 -b .dashn +%patch5 -p1 -b .read nroff -me eight-bit.me > eight-bit.txt @@ -100,6 +102,9 @@ fi %{_mandir}/*/* %changelog +* Fri Aug 5 2005 Miloslav Trmac - 6.14-4 +- Fix EOF handling in $< (#165095) + * Thu Jul 7 2005 Miloslav Trmac - 6.14-3 - Fix -n (#162187)