diff options
| author | Chet Ramey <chet.ramey@case.edu> | 2012-03-13 15:11:43 -0400 |
|---|---|---|
| committer | Chet Ramey <chet.ramey@case.edu> | 2012-03-13 15:11:43 -0400 |
| commit | ea6616c01e453e5536308bf32fc37598f9c06950 (patch) | |
| tree | eeef6b356c134f7916b6d869f2c0e8934ab1914c | |
| parent | 952a575888196bfabdf31665325633891c2968f3 (diff) | |
| download | bash-ea6616c01e453e5536308bf32fc37598f9c06950.tar.gz | |
Bash-4.2 patch 22
| -rw-r--r-- | lib/sh/zread.c | 5 | ||||
| -rw-r--r-- | patchlevel.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/lib/sh/zread.c b/lib/sh/zread.c index 0fd1199e..5db21a98 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 2ffa36e6..9166366b 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_ */ |