diff options
| author | mischief <mischief@offblast.org> | 2014-06-27 23:51:14 -0700 |
|---|---|---|
| committer | mischief <mischief@offblast.org> | 2014-06-27 23:51:14 -0700 |
| commit | 9d30b0f32dd9d8219805ed0d3ef04605c5f461cf (patch) | |
| tree | 6ceb8101b4e7e66bb8cc55710db6369275f3e9dd /sys/src | |
| parent | 5aee1a997f8a682b3fb9f935f014057e9366ce52 (diff) | |
| parent | ec572a53a9acb392df42fa69f4051898480acad7 (diff) | |
merge
Diffstat (limited to 'sys/src')
| -rw-r--r-- | sys/src/cmd/nusb/ptp/ptp.c | 13 | ||||
| -rw-r--r-- | sys/src/cmd/upas/fs/imap4.c | 13 |
2 files changed, 17 insertions, 9 deletions
diff --git a/sys/src/cmd/nusb/ptp/ptp.c b/sys/src/cmd/nusb/ptp/ptp.c index 8e618bb63..c43ef802c 100644 --- a/sys/src/cmd/nusb/ptp/ptp.c +++ b/sys/src/cmd/nusb/ptp/ptp.c @@ -45,10 +45,7 @@ struct Ptprpc uchar type[2]; uchar code[2]; uchar transid[4]; - union { - uchar p[5][4]; - uchar d[52]; - }; + uchar d[52]; }; struct Node @@ -225,7 +222,7 @@ vptprpc(Ioproc *io, int code, int flags, va_list a) for(i=0; i<np; i++){ int x = va_arg(a, int); - PUT4(rpc.p[i], x); + PUT4(rpc.d + i*4, x); } if(debug) hexdump("req>", (uchar*)&rpc, n); @@ -351,10 +348,10 @@ Resp1: if(flags & OutParam){ int *pp; - for(i=0; i<nelem(rpc.p); i++){ + for(i=0; i<5; i++){ if((pp = va_arg(a, int*)) == nil) break; - *pp = GET4(rpc.p[i]); + *pp = GET4(rpc.d + i*4); } } return 0; @@ -1040,7 +1037,7 @@ threadmain(int argc, char **argv) time0 = time(0); - snprint(name, sizeof name, "sdU%d.0", d->id); + snprint(name, sizeof name, "sdU%d", d->id); snprint(desc, sizeof desc, "%d.ptp", d->id); threadpostsharesrv(&fs, nil, name, desc); diff --git a/sys/src/cmd/upas/fs/imap4.c b/sys/src/cmd/upas/fs/imap4.c index 714a3e7d0..06e8fdd84 100644 --- a/sys/src/cmd/upas/fs/imap4.c +++ b/sys/src/cmd/upas/fs/imap4.c @@ -9,7 +9,18 @@ #pragma varargck type "Z" char* int doublequote(Fmt*); -int pipeline = 1; + +// if pipeline == 1 and upas/fs is used with dovecot, +// 9Xn OK responses sometimes come much later after FETCH responses, i.e. +// <- * 1 FETCH ... +// <- * 2 FETCH ... +// <- * 3 FETCH ... +// <- 9X5 OK Fetch completed. +// <- 9X6 OK Fetch completed. +// download 40: did not get message body +// <- 9X7 OK Fetch completed. +// causing multiple messages to turn into one in imap4.c:/^imap4resp. +int pipeline = 0; static char Eio[] = "i/o error"; |