diff options
| author | Robert Morris <rtm@csail.mit.edu> | 2020-08-07 15:06:43 -0400 | 
|---|---|---|
| committer | Robert Morris <rtm@csail.mit.edu> | 2020-08-07 15:06:43 -0400 | 
| commit | 354adfdafc3993771f58236771e213016ff9aed8 (patch) | |
| tree | 897b1539a46d30b14a85965a9e90ecdb0286bcfe /kernel | |
| parent | f01b1a8b71b8e0e8d7564a475a31c4e951463874 (diff) | |
| download | xv6-labs-354adfdafc3993771f58236771e213016ff9aed8.tar.gz xv6-labs-354adfdafc3993771f58236771e213016ff9aed8.tar.bz2 xv6-labs-354adfdafc3993771f58236771e213016ff9aed8.zip | |
streamline copyin/copyout code in usertests
fix bugs in read/write return values when there's an error
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/console.c | 2 | ||||
| -rw-r--r-- | kernel/fs.c | 2 | ||||
| -rw-r--r-- | kernel/pipe.c | 2 | 
3 files changed, 3 insertions, 3 deletions
| diff --git a/kernel/console.c b/kernel/console.c index 9a18cd9..2b1ed3c 100644 --- a/kernel/console.c +++ b/kernel/console.c @@ -76,7 +76,7 @@ consolewrite(int user_src, uint64 src, int n)    }    release(&cons.lock); -  return n; +  return i;  }  // diff --git a/kernel/fs.c b/kernel/fs.c index e33ec30..ec68cd7 100644 --- a/kernel/fs.c +++ b/kernel/fs.c @@ -472,7 +472,7 @@ readi(struct inode *ip, int user_dst, uint64 dst, uint off, uint n)      }      brelse(bp);    } -  return n; +  return tot;  }  // Write data to inode. diff --git a/kernel/pipe.c b/kernel/pipe.c index c066afb..7ed402d 100644 --- a/kernel/pipe.c +++ b/kernel/pipe.c @@ -96,7 +96,7 @@ pipewrite(struct pipe *pi, uint64 addr, int n)    }    wakeup(&pi->nread);    release(&pi->lock); -  return n; +  return i;  }  int | 
