Mercurial > hg > Members > innparusu > xv6-rpi
comparison src/file.c @ 30:6a7ab1d7001c
fix
author | mir3636 |
---|---|
date | Fri, 18 Jan 2019 11:50:48 +0900 |
parents | 1a64b5645cdd |
children | 96a5833d0d82 |
comparison
equal
deleted
inserted
replaced
29:a672d603ccb2 | 30:6a7ab1d7001c |
---|---|
115 if (f->readable == 0) { | 115 if (f->readable == 0) { |
116 goto next(-1); | 116 goto next(-1); |
117 } | 117 } |
118 | 118 |
119 if (f->type == FD_PIPE) { | 119 if (f->type == FD_PIPE) { |
120 goto cbc_piperead(f->pipe, addr, n, next); | 120 //goto cbc_piperead(f->pipe, addr, n, next); |
121 goto next(-1); | |
121 } | 122 } |
122 | 123 |
123 if (f->type == FD_INODE) { | 124 if (f->type == FD_INODE) { |
124 ilock(f->ip); | 125 ilock(f->ip); |
125 | 126 |
126 goto cbc_readi(f->ip, addr, f->off, n); | 127 goto cbc_readi(f->ip, addr, f->off, n, next); |
127 } | 128 } |
128 | 129 |
129 goto cbc_panic("fileread"); | 130 goto cbc_panic("fileread"); |
130 } | 131 } |
131 | 132 |