Ticket #1545: pr1545-1.diff

libcsupport/src/read.c

@@ -24 +24 @@
   size_t      count
 )
 {
-  ssize_t      rc;
   rtems_libio_t *iop;
 
   rtems_libio_check_fd( fd );
@@ -41 +40 @@
   if ( !iop->handlers->read_h )
     rtems_set_errno_and_return_minus_one( ENOTSUP );
 
-  rc = (*iop->handlers->read_h)( iop, buffer, count );
-
-  if ( rc > 0 )
-    iop->offset += rc;
-
-  return rc;
+  return (*iop->handlers->read_h)( iop, buffer, count );
 }
 
 /*

libfs/src/devfs/devread.c

@@ -43 +43 @@
   if ( status )
     return rtems_deviceio_errno(status);
 
+  if (args.bytes_moved > 0)
+    iop->offset += args.bytes_moved;
+  
   return (ssize_t) args.bytes_moved;
 }
 

libfs/src/dosfs/msdos_dir.c

@@ -265 +265 @@
             if ((*MSDOS_DIR_ENTRY_TYPE(entry)) ==
                 MSDOS_THIS_DIR_ENTRY_AND_REST_EMPTY)
             {
+                iop->offset += cmpltd;
                 rtems_semaphore_release(fs_info->vol_sema);
                 return cmpltd;
             }
@@ -468 +469 @@
         j++;
     }
 
+    iop->offset += cmpltd;
     rtems_semaphore_release(fs_info->vol_sema);
     return cmpltd;
 }

libfs/src/dosfs/msdos_file.c

@@ -159 +159 @@
     ret = fat_file_read(iop->pathinfo.mt_entry, fat_fd, iop->offset, count,
                         buffer);
 
+    iop->offset += ret;
     rtems_semaphore_release(fs_info->vol_sema);
     return ret;
 }

libfs/src/imfs/deviceio.c

@@ -129 +129 @@
   if ( status )
     return rtems_deviceio_errno(status);
 
+  if (args.bytes_moved > 0)
+    iop->offset += args.bytes_moved;
+
   return (ssize_t) args.bytes_moved;
 }
 

libfs/src/imfs/memfile.c

@@ -158 +158 @@
 )
 {
   IMFS_jnode_t   *the_jnode;
-
+  int            bytes_transferred;
   the_jnode = iop->file_info;
-
-  return IMFS_memfile_read( the_jnode, iop->offset, buffer, count );
+  bytes_transferred = IMFS_memfile_read( the_jnode, iop->offset, buffer, count );
+  iop->offset += bytes_transferred;
+  return bytes_transferred;
 }
 
 /*

libfs/src/rfs/rtems-rfs-rtems-dev.c

@@ -149 +149 @@
   if (status)
     return rtems_deviceio_errno (status);
 
+  iop->offset += args.bytes_moved;
+  
   return (ssize_t) args.bytes_moved;
 }
 

libfs/src/rfs/rtems-rfs-rtems-dir.c

@@ -148 +148 @@
   }
 
   rtems_rfs_inode_close (fs, &inode);
-  rtems_rfs_rtems_unlock (fs);
+
+  iop->offset += bytes_transfered;
   
+  rtems_rfs_rtems_unlock (fs);
+
   return (ssize_t) bytes_transfered;
 }
 

libfs/src/rfs/rtems-rfs-rtems-file.c

@@ -160 +160 @@
       }
     }
   }
+
+  iop->offset += read;
   
   rtems_rfs_rtems_unlock (rtems_rfs_file_fs (file));