From 2a6dda23e7859110112a16d071aed2292100e4ff Mon Sep 17 00:00:00 2001 From: Chet Ramey Date: Tue, 13 Mar 2012 09:52:48 -0400 Subject: [PATCH] Bash-4.2 direxpand with patch 22 --- lib/sh/zread.c | 5 ++--- patchlevel.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/sh/zread.c b/lib/sh/zread.c index 0fd1199ed..5db21a986 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 2ffa36e67..9166366b3 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_ */ -- 2.47.2