From: Chet Ramey <chet.ramey@case.edu>
Date: Tue, 13 Mar 2012 19:11:43 +0000 (-0400)
Subject: Bash-4.2 patch 22
X-Git-Tag: bash-4.3~25
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ea6616c01e453e5536308bf32fc37598f9c06950;p=platform%2Fupstream%2Fbash.git

Bash-4.2 patch 22
---

diff --git a/lib/sh/zread.c b/lib/sh/zread.c
index 0fd1199..5db21a9 100644
--- 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 2ffa36e..9166366 100644
--- 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_ */