rpms/tcsh/devel tcsh-6.14.00-wide-seeks.patch, 1.1, 1.2 tcsh.spec, 1.42, 1.43

[fedora-cvs-commits redhat com]

Author: mitr

Update of /cvs/dist/rpms/tcsh/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11173

Modified Files:
	tcsh-6.14.00-wide-seeks.patch tcsh.spec 
Log Message:
* Tue Sep 26 2006 Miloslav Trmac <mitr redhat com> - 6.14-12
- Fix error handling in tcsh-6.14.00-wide-seeks.patch


tcsh-6.14.00-wide-seeks.patch:
 sh.h     |    9 ++++++++-
 sh.lex.c |   21 ++++++++++++++++-----
 2 files changed, 24 insertions(+), 6 deletions(-)

Index: tcsh-6.14.00-wide-seeks.patch
===================================================================
RCS file: /cvs/dist/rpms/tcsh/devel/tcsh-6.14.00-wide-seeks.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tcsh-6.14.00-wide-seeks.patch	10 Jul 2006 20:52:23 -0000	1.1
+++ tcsh-6.14.00-wide-seeks.patch	26 Sep 2006 16:36:32 -0000	1.2
@@ -1,5 +1,5 @@
---- tcsh/sh.h	2005-03-25 19:46:41.000000000 +0100
-+++ tcsh-6.14.00/sh.h	2006-07-03 03:45:30.000000000 +0200
+--- tcsh-6.14.00/sh.h.wide-seeks	2005-03-25 19:46:41.000000000 +0100
++++ tcsh-6.14.00/sh.h	2006-09-26 18:26:33.000000000 +0200
 @@ -801,6 +801,13 @@
   * exactly one if the input is seekable and tell is available.
   * In other cases, the shell buffers enough blocks to keep all loops
@@ -23,21 +23,32 @@
  	Char* _c_seek;
      } fc;
  #define f_seek fc._f_seek
-diff -u tcsh-6.14.00/sh.lex.c tcsh-6.14.00/sh.lex.c
---- tcsh-6.14.00/sh.lex.c	2006-07-03 03:46:11.000000000 +0200
-+++ tcsh-6.14.00/sh.lex.c	2006-07-05 16:31:51.000000000 +0200
-@@ -1736,7 +1736,9 @@
+--- tcsh-6.14.00/sh.lex.c.wide-seeks	2006-09-26 18:26:33.000000000 +0200
++++ tcsh-6.14.00/sh.lex.c	2006-09-26 18:28:10.000000000 +0200
+@@ -1694,7 +1694,8 @@
+     char cbuf[BUFSIZE + 1];
+     ssize_t res, r;
+     size_t partial;
+-    
++    int err;
++
+     assert (nchars <= sizeof(cbuf)/sizeof(*cbuf));
+     USE(use_fclens);
+     res = 0;
+@@ -1736,7 +1737,11 @@
  	    memmove(cbuf, cbuf + i, partial - i);
  	partial -= i;
      } while (partial != 0 && nchars != 0);
 -    /* Throwing away possible partial multibyte characters on error */
 +    /* Throwing away possible partial multibyte characters on error if the
 +       stream is not seekable */
++    err = errno;
 +    lseek(fildes, -(off_t)partial, L_INCR);
++    errno = err;
      return res != 0 ? res : r;
  }
  
-@@ -1753,7 +1755,13 @@
+@@ -1753,7 +1758,13 @@
  	    (void) lseek(SHIN, fseekp, L_SET);
  	}
  	if (fseekp == feobp) {
@@ -52,7 +63,7 @@
  	    do
  		c = wide_read(SHIN, fbuf[0], BUFSIZE, 1);
  	    while (c < 0 && errno == EINTR);
-@@ -1926,9 +1934,9 @@
+@@ -1926,9 +1937,9 @@
  	return;
      case TCSH_F_SEEK:
  #ifdef WIDE_STRINGS


Index: tcsh.spec
===================================================================
RCS file: /cvs/dist/rpms/tcsh/devel/tcsh.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- tcsh.spec	9 Sep 2006 02:13:39 -0000	1.42
+++ tcsh.spec	26 Sep 2006 16:36:32 -0000	1.43
@@ -3,7 +3,7 @@
 Summary: An enhanced version of csh, the C shell.
 Name: tcsh
 Version: 6.14
-Release: 11
+Release: 12
 License: distributable
 Group: System Environment/Shells
 Source: ftp://ftp.astron.com/pub/tcsh/tcsh-%{version}.00.tar.gz
@@ -112,6 +112,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Tue Sep 26 2006 Miloslav Trmac <mitr redhat com> - 6.14-12
+- Fix error handling in tcsh-6.14.00-wide-seeks.patch
+
 * Sat Sep  9 2006 Miloslav Trmac <mitr redhat com> - 6.14-11
 - Fix an unlikely crash on startup (#188279)