WebSVN – planix.SVN – Diff – /os/branches/feature_unix/sys/src/cmd/unix/u9fs/u9fs.c

 int	chatty9p = 0;
 int	network = 1;
 int	old9p = -1;
 int	authed;
 User*	none;
+int	readonly = 0;
+int 	homeroot = 0;
 Auth *authmethods[] = {	/* first is default */
 	&authrhosts,
 	&authp9any,
 	&authnone,
 	if((fid = newfid(rx->fid, &e)) == nil){
 		seterror(tx, e);
 		return;
+	}
-	fid->path = estrdup("/");
-	if(fidstat(fid, &e) < 0){
-		seterror(tx, e);
-		freefid(fid);
-		return;
-	}
 	if(defaultuser)
 		rx->uname = defaultuser;
 	if((u = uname2user(rx->uname)) == nil
 	|| (!defaultuser && u->id == 0)){
 		/* we don't know anyone named root... */
 		seterror(tx, Eunknownuser);
 		freefid(fid);
 		return;
+	}
+	/* 'chroot' here */
+	if( homeroot ){
+		fid->path = estrdup(u->home_dir);
+	}
+	else {
+		fid->path = estrdup("/");
+	}
+	if(fidstat(fid, &e) < 0){
+		seterror(tx, e);
+		freefid(fid);
+		return;
+	}
 	fid->u = u;
 	tx->qid = stat2qid(&fid->st);
-	fprint(2,"Change root for user %s to %s\n",u->name,u->home_dir);
-	chroot(u->home_dir);
 	return;
+}
 void
 rwalk(Fcall *rx, Fcall *tx)
+{
 	int i;
 	char *path, *e;
 	Fid *fid, *nfid;
 	e = nil;
 	if((fid = oldfid(rx->fid, &e)) == nil){
 		seterror(tx, e);
 		return;
 	}
 	if(fid->omode != -1){
 		seterror(tx, Ebadusefid);
 		return;
 	}
 	if(fidstat(fid, &e) < 0){
 		seterror(tx, e);
 		return;
 	}
 	if(!S_ISDIR(fid->st.st_mode) && rx->nwname){
 		seterror(tx, Enotdir);
 		return;
+	}
 	}else{
 		if(i > 0)		/* partial walk? */
 			tx->nwqid = i;
 		else
 			seterror(tx, e);
 		if(nfid)		/* clone implicit new fid */
 			freefid(nfid);
 		free(path);
+	}
 	return;
+}
 void
 ropen(Fcall *rx, Fcall *tx)
+{
 	char *e;
 	Fid *fid;
 	if((fid = oldfid(rx->fid, &e)) == nil){
 		seterror(tx, e);
 		return;
 	}
 	if(fid->omode != -1){
 		seterror(tx, Ebadusefid);
 		return;
 	}
 	if(fidstat(fid, &e) < 0){
 		seterror(tx, e);
 		return;
+	}
 	if(!devallowed && S_ISSPECIAL(fid->st.st_mode)){
 		seterror(tx, Especial);
 		return;
 	}
 	if(useropen(fid, rx->mode, &e) < 0){
 		seterror(tx, e);
 		return;
 	}
 	tx->iounit = 0;
 	tx->qid = stat2qid(&fid->st);
+}
 void
 rcreate(Fcall *rx, Fcall *tx)
+{
 	char *e;
 	Fid *fid;
+	if(readonly){
+		seterror(tx, Eperm);
+		return;
+	}
 	if((fid = oldfid(rx->fid, &e)) == nil){
-		fprint(2,"oldfid error\n");
 		seterror(tx, e);
 		return;
+	}
 	if(fid->omode != -1){
-		fprint(2,"oldmode error\n");
 		seterror(tx, Ebadusefid);
 		return;
+	}
 	if(fidstat(fid, &e) < 0){
-		fprint(2,"fidstat error\n");
 		seterror(tx, e);
 		return;
+	}
 	if(!S_ISDIR(fid->st.st_mode)){
-		fprint(2,"isdir error\n");
 		seterror(tx, Enotdir);
 		return;
+	}
 	if(usercreate(fid, rx->name, rx->mode, rx->perm, &e) < 0){
-		fprint(2,"usercreate error\n");
 		seterror(tx, e);
 		return;
+	}
 	if(fidstat(fid, &e) < 0){
-		fprint(2,"fidstat again error\n");
 		seterror(tx, e);
 		return;
+	}
 	tx->iounit = 0;
 rwrite(Fcall *rx, Fcall *tx)
+{
 	char *e;
 	Fid *fid;
 	int n;
+	if(readonly){
+		seterror(tx, Eperm);
+		return;
+	}
 	if(rx->count > msize-IOHDRSZ){
 		seterror(tx, Etoolarge);
 		return;
+	}
 		return;
+	}
 	if((n = pwrite(fid->fd, rx->data, rx->count, rx->offset)) < 0){
 		seterror(tx, strerror(errno));
 		return;
+	}
 	tx->count = n;
+}
 void
 rclunk(Fcall *rx, Fcall *tx)
+{
 	char *e;
 	Fid *fid;
 	if((fid = oldfidex(rx->fid, -1, &e)) == nil){
 		seterror(tx, e);
 		return;
+	}
 	if (fid->auth) {
 		if (auth->clunk) {
 			e = (*auth->clunk)(rx, tx);
 			if (e) {
+			}
+		}
+	}
 	else if(fid->omode != -1 && fid->omode&ORCLOSE)
 		remove(fid->path);
 	freefid(fid);
+}
 void
 rremove(Fcall *rx, Fcall *tx)
 {
 	char *e;
 	Fid *fid;
 	if((fid = oldfid(rx->fid, &e)) == nil){
 		seterror(tx, e);
 		return;
 	}
 	if(userremove(fid, &e) < 0)
 		seterror(tx, e);
 	freefid(fid);
+}
 void
 rstat(Fcall *rx, Fcall *tx)
 {
 	char *e;
 	Fid *fid;
 	Dir d;
 	if((fid = oldfid(rx->fid, &e)) == nil){
 		seterror(tx, e);
 		return;
 	}
 	if(fidstat(fid, &e) < 0){
 		seterror(tx, e);
 		return;
+	}
 	stat2dir(fid->path, &fid->st, &d);
 	if((tx->nstat=(old9p ? convD2Mold : convD2M)(&d, tx->stat, msize)) <= BIT16SZ)
 		seterror(tx, "convD2M fails");
+}
 void
 rwstat(Fcall *rx, Fcall *tx)
+{
 	char *e;
 	char *p, *old, *new, *dir;
 	gid_t gid;
 	Dir d;
 	Fid *fid;
 	if((fid = oldfid(rx->fid, &e)) == nil){
 		seterror(tx, e);
 		return;
+	}
 	/*
 	 * wstat is supposed to be atomic.
 	 * we check all the things we can before trying anything.
 	 * still, if we are told to truncate a file and rename it and only
 	if((u32int)d.mode != (u32int)~0 && (((d.mode&DMDIR)!=0) ^ (S_ISDIR(fid->st.st_mode)!=0))){
 		seterror(tx, Edirchange);
 		return;
+	}
 	if(strcmp(fid->path, "/") == 0){
 		seterror(tx, "no wstat of root");
 		return;
+	}
 	 * (see above comment about atomicity).
 	 */
 	if((u32int)d.mode != (u32int)~0 && chmod(fid->path, unixmode(&d)) < 0){
 		if(chatty9p)
 			fprint(2, "chmod(%s, 0%luo) failed\n", fid->path, unixmode(&d));
 		seterror(tx, strerror(errno));
 		return;
+	}
 	if((u32int)d.mtime != (u32int)~0){
 		struct utimbuf t;
 		t.actime = 0;
 		t.modtime = d.mtime;
 		if(utime(fid->path, &t) < 0){
 			if(chatty9p)
 				fprint(2, "utime(%s) failed\n", fid->path);
+		}
+	}
 	if(gid != (gid_t)-1 && gid != fid->st.st_gid){
 		if(chown(fid->path, (uid_t)-1, gid) < 0){
 			if(chatty9p)
 				fprint(2, "chgrp(%s, %d) failed\n", fid->path, gid);
 			seterror(tx, strerror(errno));
 			return;
+		}
+	}
 	if((u64int)d.length != (u64int)~0 && truncate(fid->path, d.length) < 0){
 		fprint(2, "truncate(%s, %lld) failed\n", fid->path, d.length);
 		seterror(tx, strerror(errno));
 		return;
 	}
 }
 /*
  * we keep a table by numeric id.  by name lookups happen infrequently
  * while by-number lookups happen once for every directory entry read
  * and every stat request.
 	u = emalloc(sizeof(*u));
 	u->id = p->pw_uid;
 	u->name = estrdup(p->pw_name);
 	u->next = utab[p->pw_uid%nelem(utab)];
 	u->defaultgid = p->pw_gid;
 	if (p->pw_dir != nil ){
 		int n;
 		strncpy(u->home_dir,p->pw_dir,PATH_MAX);
 		u->home_dir[PATH_MAX-1]=0;
+	}
 	u->id = g->gr_gid;
 	u->name = estrdup(g->gr_name);
 	u->next = gtab[g->gr_gid%nelem(gtab)];
 	gtab[g->gr_gid%nelem(gtab)] = u;
 	return u;
 }
 User*
 uname2user(char *name)
+{
 	int i;
 	User *u;
 	struct passwd *p;
 usercreate(Fid *fid, char *elem, int omode, long perm, char **ep)
+{
 	int o, m;
 	char *opath, *npath;
 	struct stat st, parent;
-	fprint(2,"Called user create\n");
 	if(stat(fid->path, &parent) < 0){
 		*ep = strerror(errno);
 		return -1;
+	}
+}
 void
 usage(void)
+{
-	fprint(2, "usage: u9fs [-Dnz] [-a authmethod] [-m msize] [-u user] [root]\n");
+	fprint(2, "usage: u9fs [-Dnhrz] [-a authmethod] [-m msize] [-u user] [root]\n");
 	exit(1);
+}
 int
 main(int argc, char **argv)
 		network = 0;
 		break;
 	case 'u':
 		defaultuser = EARGF(usage());
 		break;
+	case 'r':
+		readonly = 1;
+		break;
+	case 'h':
+		homeroot = 1;
+		break;
 	case 'z':
 		logflag |= O_TRUNC;
 	}ARGEND
 	if(argc > 1)
 		sysfatal("cannot open log '%s'", logfile);
 	if(dup2(fd, 2) < 0)
 		sysfatal("cannot dup fd onto stderr");
 	fprint(2, "u9fs\nkill %d\n", (int)getpid());
 	fmtinstall('F', fcallconv);
 	fmtinstall('D', dirconv);
 	fmtinstall('M', dirmodeconv);
 	rxbuf = emalloc(msize);
 	txbuf = emalloc(msize);
 	databuf = emalloc(msize);
 	if(auth->init)
 		auth->init();
 	if(network)
 		getremotehostname(remotehostname, sizeof remotehostname);
 	if(gethostname(hostname, sizeof hostname) < 0)
 		strcpy(hostname, "gnot");
 	umask(0);
 	if(argc == 1)
 		if(chroot(argv[0]) < 0)
 			sysfatal("chroot '%s' failed", argv[0]);
 	none = uname2user("none");
 	if(none == nil)
 		none = uname2user("nobody");
 	serve(0, 1);

Subversion Repositories planix.SVN

(root)/os/branches/feature_unix/sys/src/cmd/unix/u9fs/u9fs.c – Rev 71 → 72