Changes in uspace/lib/c/generic/vfs/vfs.c [79ae36dd:27b76ca] in mainline

File:

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

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

@@ -69 +69 @@
  *
  */
-static async_exch_t *vfs_exchange_begin(void)
+async_exch_t *vfs_exchange_begin(void)
 {
         fibril_mutex_lock(&vfs_mutex);
@@ -87 +87 @@
  *
  */
-static void vfs_exchange_end(async_exch_t *exch)
+void vfs_exchange_end(async_exch_t *exch)
 {
         async_exchange_end(exch);
@@ -329 +329 @@
 }
 
-int open_node(fdi_node_t *node, int oflag)
-{
-        async_exch_t *exch = vfs_exchange_begin();
-        
-        ipc_call_t answer;
-        aid_t req = async_send_4(exch, VFS_IN_OPEN_NODE, node->fs_handle,
-            node->devmap_handle, node->index, oflag, &answer);
-        
-        vfs_exchange_end(exch);
-
-        sysarg_t rc;
-        async_wait_for(req, &rc);
-        
-        if (rc != EOK)
-                return (int) rc;
-        
-        return (int) IPC_GET_ARG1(answer);
-}
-
 int close(int fildes)
 {
@@ -415 +396 @@
         else
                 return -1;
+}
+
+/** Read entire buffer.
+ *
+ * In face of short reads this function continues reading until either
+ * the entire buffer is read or no more data is available (at end of file).
+ *
+ * @param fildes        File descriptor
+ * @param buf           Buffer, @a nbytes bytes long
+ * @param nbytes        Number of bytes to read
+ *
+ * @return              On success, positive number of bytes read.
+ *                      On failure, negative error code from read().
+ */
+ssize_t read_all(int fildes, void *buf, size_t nbyte)
+{
+        ssize_t cnt = 0;
+        size_t nread = 0;
+        uint8_t *bp = (uint8_t *) buf;
+
+        do {
+                bp += cnt;
+                nread += cnt;
+                cnt = read(fildes, bp, nbyte - nread);
+        } while (cnt > 0 && (nbyte - nread - cnt) > 0);
+
+        if (cnt < 0)
+                return cnt;
+
+        return nread + cnt;
+}
+
+/** Write entire buffer.
+ *
+ * This function fails if it cannot write exactly @a len bytes to the file.
+ *
+ * @param fildes        File descriptor
+ * @param buf           Data, @a nbytes bytes long
+ * @param nbytes        Number of bytes to write
+ *
+ * @return              EOK on error, return value from write() if writing
+ *                      failed.
+ */
+ssize_t write_all(int fildes, const void *buf, size_t nbyte)
+{
+        ssize_t cnt = 0;
+        ssize_t nwritten = 0;
+        const uint8_t *bp = (uint8_t *) buf;
+
+        do {
+                bp += cnt;
+                nwritten += cnt;
+                cnt = write(fildes, bp, nbyte - nwritten);
+        } while (cnt > 0 && ((ssize_t )nbyte - nwritten - cnt) > 0);
+
+        if (cnt < 0)
+                return cnt;
+
+        if ((ssize_t)nbyte - nwritten - cnt > 0)
+                return EIO;
+
+        return nbyte;
 }
 
@@ -757 +800 @@
 }
 
-int fd_node(int fildes, fdi_node_t *node)
-{
-        struct stat stat;
-        int rc = fstat(fildes, &stat);
-        
-        if (rc == EOK) {
-                node->fs_handle = stat.fs_handle;
-                node->devmap_handle = stat.devmap_handle;
-                node->index = stat.index;
-        }
-        
-        return rc;
-}
-
 int dup2(int oldfd, int newfd)
 {
@@ -786 +815 @@
 }
 
+int fd_wait(void)
+{
+        async_exch_t *exch = vfs_exchange_begin();
+        
+        sysarg_t ret;
+        sysarg_t rc = async_req_0_1(exch, VFS_IN_WAIT_HANDLE, &ret);
+        
+        vfs_exchange_end(exch);
+        
+        if (rc == EOK)
+                return (int) ret;
+        
+        return (int) rc;
+}
+
 /** @}
  */