Blame

Date:
Message:
Add support for user-level 9P servers/clients and various bug fixes to go with them.
Actions:
History | Blob | Raw File
  1 d3df3087 2003-12-06 devnull #include <u.h>

  2 d3df3087 2003-12-06 devnull #include <libc.h>

  3 d3df3087 2003-12-06 devnull #include <fcall.h>

  4 d3df3087 2003-12-06 devnull #include <fs.h>

  5 d3df3087 2003-12-06 devnull 

  6 d3df3087 2003-12-06 devnull char *addr;

  7 d3df3087 2003-12-06 devnull 

  8 d3df3087 2003-12-06 devnull void

  9 d3df3087 2003-12-06 devnull usage(void)

 10 d3df3087 2003-12-06 devnull {

 11 d3df3087 2003-12-06 devnull 	fprint(2, "usage: 9p [-a address] cmd args...\n");

 12 d3df3087 2003-12-06 devnull 	fprint(2, "possible cmds:\n");

 13 d3df3087 2003-12-06 devnull 	fprint(2, "	read name\n");

 14 32f69c36 2003-12-11 devnull 	fprint(2, "	readfd name\n");

 15 d3df3087 2003-12-06 devnull 	fprint(2, "	write name\n");

 16 32f69c36 2003-12-11 devnull 	fprint(2, "	writefd name\n");

 17 d3df3087 2003-12-06 devnull 	fprint(2, "	stat name\n");

 18 d3df3087 2003-12-06 devnull //	fprint(2, "	ls name\n");

 19 d3df3087 2003-12-06 devnull 	fprint(2, "without -a, name elem/path means /path on server unix!$ns/elem\n");

 20 d3df3087 2003-12-06 devnull 	exits("usage");

 21 d3df3087 2003-12-06 devnull }

 22 d3df3087 2003-12-06 devnull 

 23 d3df3087 2003-12-06 devnull void xread(int, char**);

 24 d3df3087 2003-12-06 devnull void xwrite(int, char**);

 25 32f69c36 2003-12-11 devnull void xreadfd(int, char**);

 26 32f69c36 2003-12-11 devnull void xwritefd(int, char**);

 27 d3df3087 2003-12-06 devnull void xstat(int, char**);

 28 d3df3087 2003-12-06 devnull void xls(int, char**);

 29 d3df3087 2003-12-06 devnull 

 30 d3df3087 2003-12-06 devnull struct {

 31 d3df3087 2003-12-06 devnull 	char *s;

 32 d3df3087 2003-12-06 devnull 	void (*f)(int, char**);

 33 d3df3087 2003-12-06 devnull } cmds[] = {

 34 d3df3087 2003-12-06 devnull 	"read", xread,

 35 d3df3087 2003-12-06 devnull 	"write", xwrite,

 36 32f69c36 2003-12-11 devnull 	"readfd", xreadfd,

 37 32f69c36 2003-12-11 devnull 	"writefd", xwritefd,

 38 d3df3087 2003-12-06 devnull 	"stat", xstat,

 39 d3df3087 2003-12-06 devnull //	"ls", xls,

 40 d3df3087 2003-12-06 devnull };

 41 d3df3087 2003-12-06 devnull 

 42 d3df3087 2003-12-06 devnull void

 43 d3df3087 2003-12-06 devnull main(int argc, char **argv)

 44 d3df3087 2003-12-06 devnull {

 45 d3df3087 2003-12-06 devnull 	char *cmd;

 46 d3df3087 2003-12-06 devnull 	int i;

 47 d3df3087 2003-12-06 devnull 

 48 d3df3087 2003-12-06 devnull 	ARGBEGIN{

 49 d3df3087 2003-12-06 devnull 	case 'a':

 50 d3df3087 2003-12-06 devnull 		addr = EARGF(usage());

 51 d3df3087 2003-12-06 devnull 		break;

 52 d3df3087 2003-12-06 devnull 	default:

 53 d3df3087 2003-12-06 devnull 		usage();

 54 d3df3087 2003-12-06 devnull 	}ARGEND

 55 d3df3087 2003-12-06 devnull 

 56 d3df3087 2003-12-06 devnull 	if(argc < 1)

 57 d3df3087 2003-12-06 devnull 		usage();

 58 d3df3087 2003-12-06 devnull 

 59 d3df3087 2003-12-06 devnull 	cmd = argv[0];

 60 d3df3087 2003-12-06 devnull 	for(i=0; i<nelem(cmds); i++){

 61 d3df3087 2003-12-06 devnull 		if(strcmp(cmds[i].s, cmd) == 0){

 62 d3df3087 2003-12-06 devnull 			cmds[i].f(argc, argv);

 63 d3df3087 2003-12-06 devnull 			exits(0);

 64 d3df3087 2003-12-06 devnull 		}

 65 d3df3087 2003-12-06 devnull 	}

 66 d3df3087 2003-12-06 devnull 	usage();	

 67 d3df3087 2003-12-06 devnull }

 68 d3df3087 2003-12-06 devnull 

 69 d3df3087 2003-12-06 devnull Fsys*

 70 d3df3087 2003-12-06 devnull xparse(char *name, char **path)

 71 d3df3087 2003-12-06 devnull {

 72 d3df3087 2003-12-06 devnull 	int fd;

 73 d3df3087 2003-12-06 devnull 	char *p;

 74 d3df3087 2003-12-06 devnull 	Fsys *fs;

 75 d3df3087 2003-12-06 devnull 

 76 d3df3087 2003-12-06 devnull 	if(addr == nil){

 77 d3df3087 2003-12-06 devnull 		p = strchr(name, '/');

 78 d3df3087 2003-12-06 devnull 		if(p == nil)

 79 d3df3087 2003-12-06 devnull 			p = name+strlen(name);

 80 d3df3087 2003-12-06 devnull 		else

 81 d3df3087 2003-12-06 devnull 			*p++ = 0;

 82 d3df3087 2003-12-06 devnull 		*path = p;

 83 32f69c36 2003-12-11 devnull 		fs = nsmount(name, "");

 84 32f69c36 2003-12-11 devnull 		if(fs == nil)

 85 32f69c36 2003-12-11 devnull 			sysfatal("mount: %r");

 86 32f69c36 2003-12-11 devnull 	}else{

 87 d3df3087 2003-12-06 devnull 		*path = name;

 88 32f69c36 2003-12-11 devnull 		fprint(2, "dial %s...", addr);

 89 32f69c36 2003-12-11 devnull 		if((fd = dial(addr, nil, nil, nil)) < 0)

 90 32f69c36 2003-12-11 devnull 			sysfatal("dial: %r");

 91 32f69c36 2003-12-11 devnull 		if((fs = fsmount(fd, "")) == nil)

 92 32f69c36 2003-12-11 devnull 			sysfatal("fsmount: %r");

 93 32f69c36 2003-12-11 devnull 	}

 94 d3df3087 2003-12-06 devnull 	return fs;

 95 d3df3087 2003-12-06 devnull }

 96 d3df3087 2003-12-06 devnull 

 97 d3df3087 2003-12-06 devnull Fid*

 98 d3df3087 2003-12-06 devnull xwalk(char *name)

 99 d3df3087 2003-12-06 devnull {

100 d3df3087 2003-12-06 devnull 	Fid *fid;

101 d3df3087 2003-12-06 devnull 	Fsys *fs;

102 d3df3087 2003-12-06 devnull 

103 d3df3087 2003-12-06 devnull 	fs = xparse(name, &name);

104 d3df3087 2003-12-06 devnull 	fid = fswalk(fsroot(fs), name);

105 d3df3087 2003-12-06 devnull 	if(fid == nil)

106 d3df3087 2003-12-06 devnull 		sysfatal("fswalk %s: %r", name);

107 d3df3087 2003-12-06 devnull 	return fid;

108 d3df3087 2003-12-06 devnull }

109 d3df3087 2003-12-06 devnull 

110 d3df3087 2003-12-06 devnull Fid*

111 d3df3087 2003-12-06 devnull xopen(char *name, int mode)

112 d3df3087 2003-12-06 devnull {

113 d3df3087 2003-12-06 devnull 	Fid *fid;

114 d3df3087 2003-12-06 devnull 	Fsys *fs;

115 d3df3087 2003-12-06 devnull 

116 d3df3087 2003-12-06 devnull 	fs = xparse(name, &name);

117 d3df3087 2003-12-06 devnull 	fid = fsopen(fs, name, mode);

118 d3df3087 2003-12-06 devnull 	if(fid == nil)

119 d3df3087 2003-12-06 devnull 		sysfatal("fsopen %s: %r", name);

120 d3df3087 2003-12-06 devnull 	return fid;

121 d3df3087 2003-12-06 devnull }

122 d3df3087 2003-12-06 devnull 

123 32f69c36 2003-12-11 devnull int

124 32f69c36 2003-12-11 devnull xopenfd(char *name, int mode)

125 32f69c36 2003-12-11 devnull {

126 32f69c36 2003-12-11 devnull 	Fsys *fs;

127 32f69c36 2003-12-11 devnull 

128 32f69c36 2003-12-11 devnull 	fs = xparse(name, &name);

129 32f69c36 2003-12-11 devnull 	return fsopenfd(fs, name, mode);

130 32f69c36 2003-12-11 devnull }

131 32f69c36 2003-12-11 devnull 

132 d3df3087 2003-12-06 devnull void

133 d3df3087 2003-12-06 devnull xread(int argc, char **argv)

134 d3df3087 2003-12-06 devnull {

135 d3df3087 2003-12-06 devnull 	char buf[1024];

136 d3df3087 2003-12-06 devnull 	int n;

137 d3df3087 2003-12-06 devnull 	Fid *fid;

138 d3df3087 2003-12-06 devnull 

139 d3df3087 2003-12-06 devnull 	ARGBEGIN{

140 d3df3087 2003-12-06 devnull 	default:

141 d3df3087 2003-12-06 devnull 		usage();

142 d3df3087 2003-12-06 devnull 	}ARGEND

143 d3df3087 2003-12-06 devnull 

144 d3df3087 2003-12-06 devnull 	if(argc != 1)

145 d3df3087 2003-12-06 devnull 		usage();

146 d3df3087 2003-12-06 devnull 

147 d3df3087 2003-12-06 devnull 	fid = xopen(argv[0], OREAD);

148 d3df3087 2003-12-06 devnull 	while((n = fsread(fid, buf, sizeof buf)) > 0)

149 d3df3087 2003-12-06 devnull 		write(1, buf, n);

150 d3df3087 2003-12-06 devnull 	if(n < 0)

151 d3df3087 2003-12-06 devnull 		sysfatal("read error: %r");

152 d3df3087 2003-12-06 devnull 	exits(0);	

153 d3df3087 2003-12-06 devnull }

154 d3df3087 2003-12-06 devnull 

155 d3df3087 2003-12-06 devnull void

156 32f69c36 2003-12-11 devnull xreadfd(int argc, char **argv)

157 32f69c36 2003-12-11 devnull {

158 32f69c36 2003-12-11 devnull 	char buf[1024];

159 32f69c36 2003-12-11 devnull 	int n;

160 32f69c36 2003-12-11 devnull 	int fd;

161 32f69c36 2003-12-11 devnull 

162 32f69c36 2003-12-11 devnull 	ARGBEGIN{

163 32f69c36 2003-12-11 devnull 	default:

164 32f69c36 2003-12-11 devnull 		usage();

165 32f69c36 2003-12-11 devnull 	}ARGEND

166 32f69c36 2003-12-11 devnull 

167 32f69c36 2003-12-11 devnull 	if(argc != 1)

168 32f69c36 2003-12-11 devnull 		usage();

169 32f69c36 2003-12-11 devnull 

170 32f69c36 2003-12-11 devnull 	fd = xopenfd(argv[0], OREAD);

171 32f69c36 2003-12-11 devnull 	while((n = read(fd, buf, sizeof buf)) > 0)

172 32f69c36 2003-12-11 devnull 		write(1, buf, n);

173 32f69c36 2003-12-11 devnull 	if(n < 0)

174 32f69c36 2003-12-11 devnull 		sysfatal("read error: %r");

175 32f69c36 2003-12-11 devnull 	exits(0);	

176 32f69c36 2003-12-11 devnull }

177 32f69c36 2003-12-11 devnull 

178 32f69c36 2003-12-11 devnull void

179 d3df3087 2003-12-06 devnull xwrite(int argc, char **argv)

180 d3df3087 2003-12-06 devnull {

181 d3df3087 2003-12-06 devnull 	char buf[1024];

182 d3df3087 2003-12-06 devnull 	int n;

183 d3df3087 2003-12-06 devnull 	Fid *fid;

184 d3df3087 2003-12-06 devnull 

185 d3df3087 2003-12-06 devnull 	ARGBEGIN{

186 d3df3087 2003-12-06 devnull 	default:

187 d3df3087 2003-12-06 devnull 		usage();

188 d3df3087 2003-12-06 devnull 	}ARGEND

189 d3df3087 2003-12-06 devnull 

190 d3df3087 2003-12-06 devnull 	if(argc != 1)

191 d3df3087 2003-12-06 devnull 		usage();

192 d3df3087 2003-12-06 devnull 

193 d3df3087 2003-12-06 devnull 	fid = xopen(argv[0], OWRITE|OTRUNC);

194 d3df3087 2003-12-06 devnull 	while((n = read(0, buf, sizeof buf)) > 0)

195 d3df3087 2003-12-06 devnull 		if(fswrite(fid, buf, n) != n)

196 d3df3087 2003-12-06 devnull 			sysfatal("write error: %r");

197 d3df3087 2003-12-06 devnull 	if(n < 0)

198 d3df3087 2003-12-06 devnull 		sysfatal("read error: %r");

199 d3df3087 2003-12-06 devnull 	exits(0);	

200 d3df3087 2003-12-06 devnull }

201 d3df3087 2003-12-06 devnull 

202 d3df3087 2003-12-06 devnull void

203 32f69c36 2003-12-11 devnull xwritefd(int argc, char **argv)

204 32f69c36 2003-12-11 devnull {

205 32f69c36 2003-12-11 devnull 	char buf[1024];

206 32f69c36 2003-12-11 devnull 	int n;

207 32f69c36 2003-12-11 devnull 	int fd;

208 32f69c36 2003-12-11 devnull 

209 32f69c36 2003-12-11 devnull 	ARGBEGIN{

210 32f69c36 2003-12-11 devnull 	default:

211 32f69c36 2003-12-11 devnull 		usage();

212 32f69c36 2003-12-11 devnull 	}ARGEND

213 32f69c36 2003-12-11 devnull 

214 32f69c36 2003-12-11 devnull 	if(argc != 1)

215 32f69c36 2003-12-11 devnull 		usage();

216 32f69c36 2003-12-11 devnull 

217 32f69c36 2003-12-11 devnull 	fd = xopenfd(argv[0], OWRITE|OTRUNC);

218 32f69c36 2003-12-11 devnull 	while((n = read(0, buf, sizeof buf)) > 0)

219 32f69c36 2003-12-11 devnull 		if(write(fd, buf, n) != n)

220 32f69c36 2003-12-11 devnull 			sysfatal("write error: %r");

221 32f69c36 2003-12-11 devnull 	if(n < 0)

222 32f69c36 2003-12-11 devnull 		sysfatal("read error: %r");

223 32f69c36 2003-12-11 devnull 	exits(0);	

224 32f69c36 2003-12-11 devnull }

225 32f69c36 2003-12-11 devnull 

226 32f69c36 2003-12-11 devnull void

227 d3df3087 2003-12-06 devnull xstat(int argc, char **argv)

228 d3df3087 2003-12-06 devnull {

229 d3df3087 2003-12-06 devnull 	Dir *d;

230 d3df3087 2003-12-06 devnull 	Fid *fid;

231 d3df3087 2003-12-06 devnull 

232 d3df3087 2003-12-06 devnull 	ARGBEGIN{

233 d3df3087 2003-12-06 devnull 	default:

234 d3df3087 2003-12-06 devnull 		usage();

235 d3df3087 2003-12-06 devnull 	}ARGEND

236 d3df3087 2003-12-06 devnull 

237 d3df3087 2003-12-06 devnull 	if(argc != 1)

238 d3df3087 2003-12-06 devnull 		usage();

239 d3df3087 2003-12-06 devnull 

240 d3df3087 2003-12-06 devnull 	fid = xwalk(argv[0]);

241 d3df3087 2003-12-06 devnull 	if((d = fsdirfstat(fid)) < 0)

242 d3df3087 2003-12-06 devnull 		sysfatal("dirfstat: %r");

243 d3df3087 2003-12-06 devnull 	fmtinstall('D', dirfmt);

244 d3df3087 2003-12-06 devnull 	fmtinstall('M', dirmodefmt);

245 d3df3087 2003-12-06 devnull 	print("%D\n", d);

246 d3df3087 2003-12-06 devnull 	exits(0);

247 d3df3087 2003-12-06 devnull }