Ignore:
Timestamp:
May 15, 2012, 8:06:18 AM (7 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Children:
1c0263c
Parents:
d5d071d (diff), da154e14 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'upstream'

File:
1 edited

Legend:

Unmodified
Added
Removed
  • cpukit/libfs/src/dosfs/msdos_file.c

    rd5d071d ra7d1992c  
    118118    ret = fat_file_read(iop->pathinfo.mt_entry, fat_fd, iop->offset, count,
    119119                        buffer);
     120    if (ret > 0)
     121        iop->offset += ret;
    120122
    121123    rtems_semaphore_release(fs_info->vol_sema);
     
    164166     * file was extended
    165167     */
    166     if (iop->offset + ret > fat_fd->fat_file_size)
    167         fat_fd->fat_file_size = iop->offset + ret;
     168    iop->offset += ret;
     169    if (iop->offset > fat_fd->fat_file_size)
     170        fat_fd->fat_file_size = iop->offset;
    168171
    169172    rtems_semaphore_release(fs_info->vol_sema);
     
    274277    int                rc = RC_OK;
    275278    rtems_status_code  sc = RTEMS_SUCCESSFUL;
    276     fat_file_fd_t     *fat_fd = iop->pathinfo.node_access;
    277279    msdos_fs_info_t   *fs_info = iop->pathinfo.mt_entry->fs_info;
    278280
Note: See TracChangeset for help on using the changeset viewer.