devshr: changed #σc to contain directories

nusb: detaching

4 files changed, 9 insertions, 9 deletions

diff --git a/sys/src/lib9p/post.c b/sys/src/lib9p/post.c
index 37dcfd5dc..8abddfbd1 100644
--- a/sys/src/lib9p/post.c
+++ b/sys/src/lib9p/post.c
@@ -57,7 +57,7 @@ _postmountsrv(Srv *s, char *name, char *mtpt, int flag)
 }
 
 void
-_postsharesrv(Srv *s, char *name, char *mtpt, char *desc, char *flag)
+_postsharesrv(Srv *s, char *name, char *mtpt, char *desc)
 {
 	int fd[2];
 
@@ -99,7 +99,7 @@ _postsharesrv(Srv *s, char *name, char *mtpt, char *desc, char *flag)
 	}
 
 	if(mtpt){
-		if(sharefd(mtpt, desc, flag, s->srvfd) < 0)
+		if(sharefd(mtpt, desc, s->srvfd) < 0)
 			sysfatal("sharefd %s: %r", mtpt);
 	}else
 		close(s->srvfd);
diff --git a/sys/src/lib9p/rfork.c b/sys/src/lib9p/rfork.c
index 37cf6448b..45bf59365 100644
--- a/sys/src/lib9p/rfork.c
+++ b/sys/src/lib9p/rfork.c
@@ -33,8 +33,8 @@ postmountsrv(Srv *s, char *name, char *mtpt, int flag)
 }
 
 void
-postsharesrv(Srv *s, char *name, char *mtpt, char *desc, char *flag)
+postsharesrv(Srv *s, char *name, char *mtpt, char *desc)
 {
 	_forker = rforker;
-	_postsharesrv(s, name, mtpt, desc, flag);
+	_postsharesrv(s, name, mtpt, desc);
 }
diff --git a/sys/src/lib9p/srv.c b/sys/src/lib9p/srv.c
index bbe025b46..a0b89cba8 100644
--- a/sys/src/lib9p/srv.c
+++ b/sys/src/lib9p/srv.c
@@ -852,12 +852,12 @@ postfd(char *name, int pfd)
 }
 
 int
-sharefd(char *name, char *desc, char *flags, int pfd)
+sharefd(char *name, char *desc, int pfd)
 {
 	int fd;
 	char buf[80];
 
-	snprint(buf, sizeof buf, "#σc/%s", name);
+	snprint(buf, sizeof buf, "#σc/%s/%s", name, desc);
 	if(chatty9p)
 		fprint(2, "sharefd %s\n", buf);
 	fd = create(buf, OWRITE, 0600);
@@ -866,7 +866,7 @@ sharefd(char *name, char *desc, char *flags, int pfd)
 			fprint(2, "create fails: %r\n");
 		return -1;
 	}
-	if(fprint(fd, "%s %d %s\n", flags, pfd, desc) < 0){
+	if(fprint(fd, "%d\n", pfd) < 0){
 		if(chatty9p)
 			fprint(2, "write fails: %r\n");
 		close(fd);
diff --git a/sys/src/lib9p/thread.c b/sys/src/lib9p/thread.c
index 61de5823e..445791be4 100644
--- a/sys/src/lib9p/thread.c
+++ b/sys/src/lib9p/thread.c
@@ -25,8 +25,8 @@ threadpostmountsrv(Srv *s, char *name, char *mtpt, int flag)
 }
 
 void
-threadpostsharesrv(Srv *s, char *name, char *mtpt, char *desc, char* flag)
+threadpostsharesrv(Srv *s, char *name, char *mtpt, char *desc)
 {
 	_forker = tforker;
-	_postsharesrv(s, name, mtpt, desc, flag);
+	_postsharesrv(s, name, mtpt, desc);
 }