Changeset a737667e in mainline for uspace/lib/c/generic/vfs/vfs.c

Timestamp:

2017-03-08T09:56:06Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5126f80

Parents:

bb9ec2d

Message:

Implement statfs() using _vfs_walk()

File:

• uspace/lib/c/generic/vfs/vfs.c (modified) (1 diff)

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

@@ -1124 +1124 @@
 int statfs(const char *path, struct statfs *st)
 {
-        sysarg_t rc, rc_orig;
+        size_t pa_size;
+        char *pa = vfs_absolutize(path, &pa_size);
+        if (!pa) {
+                errno = ENOMEM;
+                return -1;
+        }
+        
+        int fd = _vfs_walk(-1, pa, 0);
+        if (fd < 0) {
+                free(pa);
+                errno = fd;
+                return -1;
+        }
+
+        free(pa);
+        
+        sysarg_t rc, ret;
         aid_t req;
-        size_t pa_size;
-
-        char *pa = vfs_absolutize(path, &pa_size);
-        if (pa == NULL) {
-                errno = ENOMEM;
-                return -1;
-        }
-
-        async_exch_t *exch = vfs_exchange_begin();
-
-        req = async_send_0(exch, VFS_IN_STATFS, NULL);
-        rc = async_data_write_start(exch, pa, pa_size);
-        if (rc != EOK)
-                goto exit;
-
+
+        async_exch_t *exch = vfs_exchange_begin();
+
+        req = async_send_1(exch, VFS_IN_STATFS, fd, NULL);
         rc = async_data_read_start(exch, (void *) st, sizeof(*st));
 
-exit:
-        vfs_exchange_end(exch);
-        free(pa);
-        async_wait_for(req, &rc_orig);
-        rc = (rc_orig != EOK ? rc_orig : rc);
-
+        vfs_exchange_end(exch);
+        async_wait_for(req, &ret);
+        close(fd);
+
+        rc = (ret != EOK ? ret : rc);
         if (rc != EOK) {
                 errno = rc;