shithub: ridefs

Info  •  Files  •  Log  •  Branches

Minor cleanup

--- a/ridefs.c

+++ b/ridefs.c

@@ -698,8 +698,7 @@

 			rlock(f->l);

 			fd = dup(c->qtext.fd, -1);

-			seek(fd, r->ifcall.offset, 0);

-			r->ofcall.count = read(fd, r->ofcall.data, r->ifcall.count);

+			r->ofcall.count = pread(fd, r->ofcall.data, r->ifcall.count, r->ifcall.offset);

 			close(fd);

 			runlock(f->l);

@@ -824,15 +823,16 @@

 		}

 		c = clientref(f->client);

+		s = "directory entry not found";

 		switch(i){

 		case Qclient:

-			if(c == nil || c->ref == 0) return "directory entry not found";

+			if(c == nil || c->ref == 0) return s;

 			incref(c);

 			break;

-		case Qtext: if(c->addr == nil) return "directory entry not found"; break;

-		case Qinfo: if(c->qinfo == nil) return "directory entry not found"; break;

-		case Qevent: if(c->ev.in == 0) return "directory entry not found"; break;

-		case QCOUNT: return "directory entry not found"; break;

+		case Qtext: if(c->addr == nil) return s; break;

+		case Qinfo: if(c->qinfo == nil) return s; break;

+		case Qevent: if(c->ev.in == 0) return s; break;

+		case QCOUNT: return s; break;

 		}

 		f->kind = i;

@@ -878,7 +878,7 @@

 void

 usage(void){

-	fprintf(stderr, "usage: %s [-Dd] [-m mtpt] [-s service] [-p defport] -n [nclients]\n", argv0);

+	fprintf(stderr, "usage: %s [-Dd] [-m mtpt] [-s service] [-p defport] [-n nclients]\n", argv0);

 }

 void

@@ -904,4 +904,4 @@

 	rfork(RFNOTEG);

 	postmountsrv(&fs, service, mtpt, MREPL);

 	exits(nil);

-}

\ No newline at end of file

+}

-- 

⑨