Bash-4.2 patch 22

diff --git a/lib/sh/zread.c b/lib/sh/zread.c
index 0fd1199ed1f79c21087809386e52c91bd6b99106..5db21a986eba173ae2482a9b28730b2870711d08 100644 (file)
--- a/lib/sh/zread.c
+++ b/lib/sh/zread.c
@@ -160,14 +160,13 @@ void
 zsyncfd (fd)
      int fd;
 {
-  off_t off;
-  int r;
+  off_t off, r;
 
   off = lused - lind;
   r = 0;
   if (off > 0)
     r = lseek (fd, -off, SEEK_CUR);
 
-  if (r >= 0)
+  if (r != -1)
     lused = lind = 0;
 }

diff --git a/patchlevel.h b/patchlevel.h
index 2ffa36e6730477e937a54333fcadd6d9964b4e9d..9166366b330ce80e35160f598ce16461798a90c6 100644 (file)
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -25,6 +25,6 @@
    regexp `^#define[   ]*PATCHLEVEL', since that's what support/mkversion.sh
    looks for to find the patch level (for the sccs version string). */
 
-#define PATCHLEVEL 21
+#define PATCHLEVEL 22
 
 #endif /* _PATCHLEVEL_H_ */