vx32

commit ded0ccb1dd91f544ebfd3217c2bda1cacc503560
parent 6954d7b0709f9ff19d89e94ced0ac5a9e0352373
Author: Jesus Galan Lopez (yiyus) <yiyu.jgl@gmail.com>
Date:   Sat, 11 Sep 2010 14:48:24 +0200

more a/ updates (6 more to finish)

Diffstat:
src/9vx/a/AUTOGEN
 | 
2
+-
src/9vx/a/auth.c
 | 
6
+++---
src/9vx/a/auth.ed
 | 
14
++++++++++++++
src/9vx/a/ureg.ed
 | 
1
+

4 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/src/9vx/a/AUTOGEN b/src/9vx/a/AUTOGEN
@@ -34,7 +34,7 @@ autofiles="
 /sys/src/9/pc/sdscsi.c
 /sys/src/9/port/allocb.c
 #/sys/src/9/port/aoe.h
-#/sys/src/9/port/auth.c
+/sys/src/9/port/auth.c
 /sys/src/9/port/chan.c
 /sys/src/9/port/dev.c
 #/sys/src/9/port/devaoe.c
diff --git a/src/9vx/a/auth.c b/src/9vx/a/auth.c
@@ -27,8 +27,8 @@ sysfversion(uint32 *arg)
 	Chan *c;
 
 	msize = arg[1];
-	arglen = arg[3];
 	vers = uvalidaddr(arg[2], arglen, 1);
+	arglen = arg[3];
 	/* check there's a NUL in the version string */
 	if(arglen==0 || memchr(vers, 0, arglen)==0)
 		error(Ebadarg);
@@ -76,10 +76,10 @@ sysfauth(uint32 *arg)
 
 	ac = mntauth(c, aname);
 	/* at this point ac is responsible for keeping c alive */
-	cclose(c);
 	poperror();	/* c */
-	free(aname);
+	cclose(c);
 	poperror();	/* aname */
+	free(aname);
 
 	if(waserror()){
 		cclose(ac);
diff --git a/src/9vx/a/auth.ed b/src/9vx/a/auth.ed
@@ -0,0 +1,14 @@
+,s/ulong/uint32/g
+,g/validaddr/d
+/^sysfversion/ .
+/arg\[2\]/c
+	vers = uvalidaddr(arg[2], arglen, 1);
+.
+/^sys_fsession/ .
+/arg\[1\]/c
+	*(char*)uvalidaddr(arg[1], arg[2], 1) = '\0';
+.
+/^sysfauth/ .
+/arg\[1\]/c
+	aname = validnamedup(uvalidaddr(arg[1], 1, 0), 1);
+.
diff --git a/src/9vx/a/ureg.ed b/src/9vx/a/ureg.ed
@@ -0,0 +1 @@
+,s/ulong/uint32/g