commit b3e7c02689557df3c65103a87ac3458ee003422f from: rsc date: Tue Mar 15 14:17:57 2005 UTC get rid of .= syntax commit - d5c40a0da2889b9ff4ad8e23258da297489a701d commit + b3e7c02689557df3c65103a87ac3458ee003422f blob - 678594a20c522f4d9332c341d1c8ef6484ab8c3c blob + eaf94cafee87efc6094ccf5882e1343c86ee3453 --- src/cmd/auth/factotum/dat.h +++ src/cmd/auth/factotum/dat.h @@ -114,6 +114,8 @@ extern char *rpcname[]; /* rpc.c */ extern char Easproto[]; /* err.c */ +void fsinit0(void); + /* provided by lib9p */ #define emalloc emalloc9p #define erealloc erealloc9p blob - 88bbfd8b1576a094be9beea84fcd891e1e6418ae blob + bd6c105e6a4aac9c6f9cc7807f3e407e009a2a41 --- src/cmd/auth/factotum/fs.c +++ src/cmd/auth/factotum/fs.c @@ -517,15 +517,19 @@ fsstart(Srv *s) proccreate(fsproc, nil, STACK); } -Srv fs = { -.attach= fsattach, -.walk1= fswalk1, -.open= fssend, -.read= fssend, -.write= fssend, -.stat= fsstat, -.flush= fssend, -.destroyfid= fssendclunk, -.start= fsstart, -}; +Srv fs; + +void +fsinit0(void) +{ + fs.attach = fsattach; + fs.walk1 = fswalk1; + fs.open = fssend; + fs.read = fssend; + fs.write = fssend; + fs.stat = fsstat; + fs.flush = fssend; + fs.destroyfid = fssendclunk; + fs.start = fsstart; +} blob - f1e647745acb08e28cbe7eda75c167fd50076c8e blob + b18cbf3d1f2b85a0852689019517ed61abe160aa --- src/cmd/auth/factotum/main.c +++ src/cmd/auth/factotum/main.c @@ -80,6 +80,7 @@ threadmain(int argc, char *argv[]) } } + fsinit0(); threadpostmountsrv(&fs, service, mtpt, MBEFORE); threadexits(nil); } blob - 694d4cbc30ef89eefbf6ba34ede217fcf5d989fb blob + 789d4d709540d247c2087ef7ac79098205813100 --- src/cmd/auth/factotum/p9any.c +++ src/cmd/auth/factotum/p9any.c @@ -266,7 +266,7 @@ p9anyroles[] = }; Proto p9any = { -.name= "p9any", -.roles= p9anyroles, + "p9any", + p9anyroles, }; blob - 92b055d05caa1156b8cc454daf3fefd2071dd5fc blob + 04981e58089a8785c2ff2ab3e6cab9fc65c58115 --- src/cmd/auth/factotum/p9sk1.c +++ src/cmd/auth/factotum/p9sk1.c @@ -339,15 +339,15 @@ p9sk2roles[] = }; Proto p9sk1 = { -.name= "p9sk1", -.roles= p9sk1roles, -.checkkey= p9sk1check, -.closekey= p9sk1close, -.keyprompt= "user? dom? !password?", + "p9sk1", + p9sk1roles, + "user? dom? !password?", + p9sk1check, + p9sk1close, }; Proto p9sk2 = { -.name= "p9sk2", -.roles= p9sk2roles, + "p9sk2", + p9sk2roles, };