From b18a52b7bbe9230f3398a16cfc224f42a7cb393b Mon Sep 17 00:00:00 2001
From: "Charles.Forsyth" <devnull@localhost>
Date: Tue, 26 May 2009 16:06:44 +0000
Subject: 20090526-1706

---
 emu/port/devfs-posix.c | 11 +++++++----
 emu/port/exportfs.c    |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'emu')

diff --git a/emu/port/devfs-posix.c b/emu/port/devfs-posix.c
index bd1d9a94..c80406cb 100644
--- a/emu/port/devfs-posix.c
+++ b/emu/port/devfs-posix.c
@@ -401,10 +401,13 @@ fsread(Chan *c, void *va, long n, vlong offset)
 		qunlock(&FS(c)->oq);
 	}else{
 		r = pread(FS(c)->fd, va, n, offset);
-		if(r < 0 && (errno == ESPIPE || errno == EPIPE)){
-			r = read(FS(c)->fd, va, n);
-			if(r < 0)
-				oserror();
+		if(r < 0){
+			if(errno == ESPIPE || errno == EPIPE){
+				r = read(FS(c)->fd, va, n);
+				if(r >= 0)
+					return r;
+			}
+			oserror();
 		}
 	}
 	return r;
diff --git a/emu/port/exportfs.c b/emu/port/exportfs.c
index 1feae7ae..a52b3239 100644
--- a/emu/port/exportfs.c
+++ b/emu/port/exportfs.c
@@ -1027,7 +1027,7 @@ Exread(Export *fs, Fcall *t, Fcall *r)
 	Fid *f;
 	Chan *c;
 	Lock *cl;
-	long off;
+	vlong off;
 	int dir, n, seek;
 
 	f = Exgetfid(fs, t->fid);
-- 
cgit v1.2.3