diff options
| author | cinap_lenrek <cinap_lenrek@felloff.net> | 2016-07-24 02:21:32 +0200 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@felloff.net> | 2016-07-24 02:21:32 +0200 |
| commit | a0d4c5e208405f84076891faaa43235bb2b87fc2 (patch) | |
| tree | 9549cd4cd11c57e3c72d31f4a0424c75b1d5a063 /sys/src/cmd/paqfs | |
| parent | a840b597cad282e837560b65dad89aa0cfd4af77 (diff) | |
make error handling in 9p service loops consistent
when we get eof, stop the loop immidiately and do not
rely on the read to eventually return an error.
when convM2S() fails to decode the message, error out
and stop the loop. there is no point in continuing.
Diffstat (limited to 'sys/src/cmd/paqfs')
| -rw-r--r-- | sys/src/cmd/paqfs/paqfs.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sys/src/cmd/paqfs/paqfs.c b/sys/src/cmd/paqfs/paqfs.c index 8fe05cc05..f4be7b6f1 100644 --- a/sys/src/cmd/paqfs/paqfs.c +++ b/sys/src/cmd/paqfs/paqfs.c @@ -812,14 +812,11 @@ io(int fd) pid = getpid(); - for(;;){ - n = read9pmsg(fd, mdata, mesgsize); + while((n = read9pmsg(fd, mdata, mesgsize)) != 0){ if(n < 0) - sysfatal("mount read"); - if(n == 0) - continue; - if(convM2S(mdata, n, &rhdr) == 0) - continue; + sysfatal("mount read: %r"); + if(convM2S(mdata, n, &rhdr) != n) + sysfatal("convM2S format error: %r"); if(debug) fprint(2, "paqfs %d:<-%F\n", pid, &rhdr); |