From fca627d1b02809c4c5f915c3bf0d87b62b3ce316 Mon Sep 17 00:00:00 2001
From: John Reiser <jreiser@BitWagon.com>
Date: Fri, 15 May 2015 20:44:09 -0700
Subject: [PATCH] ::seek() returns resulting off_t; InputFile::seek() restricts
 to actual _length

---
 src/file.cpp | 14 +++++++++-----
 src/file.h   |  6 +++---
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/file.cpp b/src/file.cpp
index c5a2387c..37cdf722 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -168,7 +168,7 @@ void FileBase::write(const void *buf, int len)
 }
 
 
-void FileBase::seek(off_t off, int whence)
+off_t FileBase::seek(off_t off, int whence)
 {
     if (!isOpen())
         throwIOException("bad seek 1");
@@ -185,6 +185,7 @@ void FileBase::seek(off_t off, int whence)
     }
     if (::lseek(_fd,off,whence) < 0)
         throwIOException("seek error",errno);
+    return off - _offset;
 }
 
 
@@ -284,9 +285,12 @@ int InputFile::readx(MemBuffer &buf, int len)
 }
 
 
-void InputFile::seek(off_t off, int whence)
+off_t InputFile::seek(off_t off, int whence)
 {
-    super::seek(off,whence);
+    off_t pos = super::seek(off,whence);
+    if (_length < pos)
+        throwIOException("bad seek 4");
+    return pos;
 }
 
 
@@ -398,7 +402,7 @@ void OutputFile::rewrite(const void *buf, int len)
     bytes_written -= len;       // restore
 }
 
-void OutputFile::seek(off_t off, int whence)
+off_t OutputFile::seek(off_t off, int whence)
 {
     assert(!opt->to_stdout);
     switch (whence) {
@@ -412,7 +416,7 @@ void OutputFile::seek(off_t off, int whence)
         _length = bytes_written;  // necessary
     } break;
     }
-    super::seek(off,whence);
+    return super::seek(off,whence);
 }
 
 // WARNING: fsync() does not exist in some Windows environments.
diff --git a/src/file.h b/src/file.h
index a481671e..6c51564b 100644
--- a/src/file.h
+++ b/src/file.h
@@ -67,7 +67,7 @@ protected:
     virtual int read(void *buf, int len);
     virtual int readx(void *buf, int len);
     virtual void write(const void *buf, int len);
-    virtual void seek(off_t off, int whence);
+    virtual off_t seek(off_t off, int whence);
     virtual off_t tell() const;
 
     int _fd;
@@ -106,7 +106,7 @@ public:
     virtual int read(MemBuffer &buf, int len);
     virtual int readx(MemBuffer &buf, int len);
 
-    virtual void seek(off_t off, int whence);
+    virtual off_t seek(off_t off, int whence);
     virtual off_t tell() const;
     virtual off_t st_size_orig() const;
 protected:
@@ -142,7 +142,7 @@ public:
     virtual off_t st_size() const;  // { return _length; }
 
     // FIXME - these won't work when using the '--stdout' option
-    virtual void seek(off_t off, int whence);
+    virtual off_t seek(off_t off, int whence);
     virtual void rewrite(const void *buf, int len);
 
     // util