From 2a684c990a6ec2a9b01d964ff7e904afeafa8c0d Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Mon, 20 Oct 2008 17:33:51 -0700 Subject: 6l: use libbio instead of maintaining own buffer libbio: always use vlong offsets; die if off_t is too small R=r DELTA=163 (23 added, 63 deleted, 77 changed) OCL=17508 CL=17512 --- src/libbio/boffset.c | 7 ++++--- src/libbio/bseek.c | 12 +++++++++--- 2 files changed, 13 insertions(+), 6 deletions(-) (limited to 'src/libbio') diff --git a/src/libbio/boffset.c b/src/libbio/boffset.c index 77d8b08fa..15dd609e1 100644 --- a/src/libbio/boffset.c +++ b/src/libbio/boffset.c @@ -23,13 +23,14 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "lib9.h" +#include +#include #include -off_t +vlong Boffset(Biobuf *bp) { - off_t n; + vlong n; switch(bp->state) { default: diff --git a/src/libbio/bseek.c b/src/libbio/bseek.c index d60aeebc4..ee3ba7714 100644 --- a/src/libbio/bseek.c +++ b/src/libbio/bseek.c @@ -23,15 +23,21 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "lib9.h" +#include +#include #include -off_t -Bseek(Biobuf *bp, off_t offset, int base) +vlong +Bseek(Biobuf *bp, vlong offset, int base) { vlong n, d; int bufsz; + if(sizeof(offset) != sizeof(off_t)) { + fprint(2, "Bseek: libbio compiled with %d-byte offset\n", sizeof(off_t)); + abort(); + } + switch(bp->state) { default: fprint(2, "Bseek: unknown state %d\n", bp->state); -- cgit v1.2.3