Changeset 58898d1d in mainline for uspace/lib/c/generic/vfs/vfs.c

Timestamp:

2017-03-24T20:31:54Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8e9b2534

Parents:

c9e3692

Message:

Remove VFS_IN_SEEK from VFS

File:

• uspace/lib/c/generic/vfs/vfs.c (modified) (19 diffs)

uspace/lib/c/generic/vfs/vfs.c

@@ -444 +444 @@
  *
  * @param fildes File descriptor
+ * @param pos Position to read from
  * @param buf Buffer
  * @param nbyte Maximum number of bytes to read
@@ -450 +451 @@
  * @return EOK on success, non-zero error code on error.
  */
-static int _read_short(int fildes, void *buf, size_t nbyte, ssize_t *nread)
+static int _read_short(int fildes, aoff64_t pos, void *buf, size_t nbyte,
+    ssize_t *nread)
 {
         sysarg_t rc;
@@ -461 +463 @@
         async_exch_t *exch = vfs_exchange_begin();
         
-        req = async_send_1(exch, VFS_IN_READ, fildes, &answer);
+        req = async_send_3(exch, VFS_IN_READ, fildes, LOWER32(pos),
+            UPPER32(pos), &answer);
         rc = async_data_read_start(exch, (void *) buf, nbyte);
 
@@ -484 +487 @@
  *
  * @param fildes File descriptor
+ * @param pos Position to write to
  * @param buf Buffer
  * @param nbyte Maximum number of bytes to write
@@ -490 +494 @@
  * @return EOK on success, non-zero error code on error.
  */
-static int _write_short(int fildes, const void *buf, size_t nbyte,
+static int _write_short(int fildes, aoff64_t pos, const void *buf, size_t nbyte,
     ssize_t *nwritten)
 {
@@ -502 +506 @@
         async_exch_t *exch = vfs_exchange_begin();
         
-        req = async_send_1(exch, VFS_IN_WRITE, fildes, &answer);
+        req = async_send_3(exch, VFS_IN_WRITE, fildes, LOWER32(pos),
+            UPPER32(pos), &answer);
         rc = async_data_write_start(exch, (void *) buf, nbyte);
         
@@ -525 +530 @@
  *
  * @param fildes        File descriptor
+ * @param pos           Pointer to position to read from 
  * @param buf           Buffer, @a nbytes bytes long
  * @param nbytes        Number of bytes to read
@@ -531 +537 @@
  *                      On failure, -1 and sets errno.
  */
-ssize_t read(int fildes, void *buf, size_t nbyte)
+ssize_t read(int fildes, aoff64_t *pos, void *buf, size_t nbyte)
 {
         ssize_t cnt = 0;
@@ -541 +547 @@
                 bp += cnt;
                 nread += cnt;
-                rc = _read_short(fildes, bp, nbyte - nread, &cnt);
+                *pos += cnt;
+                rc = _read_short(fildes, *pos, bp, nbyte - nread, &cnt);
         } while (rc == EOK && cnt > 0 && (nbyte - nread - cnt) > 0);
         
@@ -549 +556 @@
         }
         
+        *pos += cnt;
         return nread + cnt;
 }
@@ -557 +565 @@
  *
  * @param fildes        File descriptor
+ * @param pos           Pointer to position to write to
  * @param buf           Data, @a nbytes bytes long
  * @param nbytes        Number of bytes to write
@@ -563 +572 @@
  *                      On failure, -1 and sets errno.
  */
-ssize_t write(int fildes, const void *buf, size_t nbyte)
+ssize_t write(int fildes, aoff64_t *pos, const void *buf, size_t nbyte)
 {
         ssize_t cnt = 0;
@@ -573 +582 @@
                 bp += cnt;
                 nwritten += cnt;
-                rc = _write_short(fildes, bp, nbyte - nwritten, &cnt);
+                *pos += cnt;
+                rc = _write_short(fildes, *pos, bp, nbyte - nwritten, &cnt);
         } while (rc == EOK && ((ssize_t )nbyte - nwritten - cnt) > 0);
 
@@ -581 +591 @@
         }
 
+        *pos += cnt;
         return nbyte;
 }
@@ -601 +612 @@
         
         return 0;
-}
-
-/** Seek to a position.
- *
- * @param fildes File descriptor
- * @param offset Offset
- * @param whence SEEK_SET, SEEK_CUR or SEEK_END
- *
- * @return On success the nonnegative offset from start of file. On error
- *         returns (off64_t)-1 and sets errno.
- */
-off64_t lseek(int fildes, off64_t offset, int whence)
-{
-        async_exch_t *exch = vfs_exchange_begin();
-        
-        sysarg_t newoff_lo;
-        sysarg_t newoff_hi;
-        sysarg_t rc = async_req_4_2(exch, VFS_IN_SEEK, fildes,
-            LOWER32(offset), UPPER32(offset), whence,
-            &newoff_lo, &newoff_hi);
-        
-        vfs_exchange_end(exch);
-        
-        if (rc != EOK) {
-                errno = rc;
-                return (off64_t) -1;
-        }
-        
-        return (off64_t) MERGE_LOUP32(newoff_lo, newoff_hi);
 }
 
@@ -757 +739 @@
         
         dirp->fd = fd;
+        dirp->pos = 0;
         return dirp;
 }
@@ -771 +754 @@
         ssize_t len;
         
-        rc = _read_short(dirp->fd, &dirp->res.d_name[0], NAME_MAX + 1, &len);
+        rc = _read_short(dirp->fd, dirp->pos, &dirp->res.d_name[0],
+            NAME_MAX + 1, &len);
         if (rc != EOK) {
                 errno = rc;
@@ -777 +761 @@
         }
         
-        (void) len;
+        dirp->pos += len;
+        
         return &dirp->res;
 }
@@ -787 +772 @@
 void rewinddir(DIR *dirp)
 {
-        (void) lseek(dirp->fd, 0, SEEK_SET);
+        dirp->pos = 0;
 }