while (size > 0)
{
/* Disk sector to read, starting byte offset within sector. */
- off_t sector_idx = inode_byte_to_sector (file->inode, file_ofs);
+ disk_sector_t sector_idx;
int sector_ofs = file_ofs % DISK_SECTOR_SIZE;
/* Bytes left in file, bytes left in sector, lesser of the two. */
/* Number of bytes to actually copy out of this sector. */
int chunk_size = size < min_left ? size : min_left;
- if (chunk_size == 0)
+ if (chunk_size <= 0)
break;
/* Read sector into bounce buffer, then copy into caller's
buffer. */
+ sector_idx = inode_byte_to_sector (file->inode, file_ofs);
disk_read (filesys_disk, sector_idx, file->bounce);
memcpy (buffer + bytes_read, file->bounce + sector_ofs, chunk_size);
while (size > 0)
{
- /* Starting byte offset within sector to read. */
- off_t sector_idx = inode_byte_to_sector (file->inode, file_ofs);
+ /* Sector to write, starting byte offset within sector. */
+ off_t sector_idx;
int sector_ofs = file_ofs % DISK_SECTOR_SIZE;
/* Bytes left in file, bytes left in sector, lesser of the two. */
int sector_left = DISK_SECTOR_SIZE - sector_ofs;
int min_left = file_left < sector_left ? file_left : sector_left;
- /* Number of bytes to actually writen into this sector. */
+ /* Number of bytes to actually write into this sector. */
int chunk_size = size < min_left ? size : min_left;
- if (chunk_size == 0)
+ if (chunk_size <= 0)
break;
/* If the sector contains data before or after the chunk
we're writing, then we need to read in the sector
first. Otherwise we start with a sector of all zeros. */
- if (sector_ofs > 0 || chunk_size < sector_ofs)
+ sector_idx = inode_byte_to_sector (file->inode, file_ofs);
+ if (sector_ofs > 0 || chunk_size < sector_left)
disk_read (filesys_disk, sector_idx, file->bounce);
else
memset (file->bounce, 0, DISK_SECTOR_SIZE);