From 669250d159e93a6933afa4cd25f410af801515ec Mon Sep 17 00:00:00 2001 From: rsc Date: Wed, 3 Dec 2003 22:50:48 +0000 Subject: Various fixes. B - fixed usage, DISPLAY :0 vs :0.0 9term - fixed various terminal things rc - notice traps in Read _p9dir - only run disk code for disks dirread - getdirentries on FreeBSD and Linux are different w.r.t. meaning of off. notify - set up so signals interrupt system calls bprint - use bfmt. --- src/lib9/dirread.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'src/lib9/dirread.c') diff --git a/src/lib9/dirread.c b/src/lib9/dirread.c index 1e479fe4..5aa5c449 100644 --- a/src/lib9/dirread.c +++ b/src/lib9/dirread.c @@ -10,7 +10,6 @@ extern int _p9dir(struct stat*, char*, Dir*, char**, char*); static int mygetdents(int fd, struct dirent *buf, int n) { - ssize_t nn; off_t off; off = p9seek(fd, 0, 1); @@ -23,14 +22,8 @@ mygetdents(int fd, struct dirent *buf, int n) static int mygetdents(int fd, struct dirent *buf, int n) { - ssize_t nn; long off; - - off = p9seek(fd, 0, 1); - nn = getdirentries(fd, (void*)buf, n, &off); - if(nn > 0) - p9seek(fd, off, 0); - return nn; + return getdirentries(fd, (void*)buf, n, &off); } #elif defined(__sun__) static int @@ -38,7 +31,7 @@ mygetdents(int fd, struct dirent *buf, int n) { return getdents(fd, (void*)buf, n); } -#endif +#endif static int countde(char *p, int n) -- cgit v1.2.3