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

Timestamp:

2017-03-30T18:58:28Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

23a0368

Parents:

fe91f66

Message:

Rename statfs() to vfs_statfs_path() and provide relativized vfs_statfs()

File:

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

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

@@ -44 +44 @@
 #include <stdio.h>
 #include <sys/stat.h>
-#include <sys/statfs.h>
 #include <sys/types.h>
 #include <ipc/services.h>
@@ -1084 +1083 @@
 
         struct statfs stfs;
-        if (statfs(path, &stfs) == EOK)
+        if (vfs_statfs_path(path, &stfs) == EOK)
                 str_cpy(ent->fs_name, sizeof(ent->fs_name), stfs.fs_name);
         else
@@ -1164 +1163 @@
 /** Get filesystem statistics.
  *
+ * @param file File located on the queried file system
+ * @param st Buffer for storing information
+ * @return 0 on success. On error -1 is returned and errno is set.
+ */
+int vfs_statfs(int file, struct statfs *st)
+{
+        sysarg_t rc, ret;
+        aid_t req;
+
+        async_exch_t *exch = vfs_exchange_begin();
+
+        req = async_send_1(exch, VFS_IN_STATFS, file, NULL);
+        rc = async_data_read_start(exch, (void *) st, sizeof(*st));
+
+        vfs_exchange_end(exch);
+        async_wait_for(req, &ret);
+
+        rc = (ret != EOK ? ret : rc);
+
+        return rc;
+}
+/** Get filesystem statistics.
+ *
  * @param path Mount point path
  * @param st Buffer for storing information
- * @return 0 on success. On error -1 is returned and errno is set.
- */
-int statfs(const char *path, struct statfs *st)
-{
-        int fd = vfs_lookup(path, 0);
-        if (fd < 0) {
-                errno = fd;
-                return -1;
-        }
-        
-        sysarg_t rc, ret;
-        aid_t req;
-
-        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));
-
-        vfs_exchange_end(exch);
-        async_wait_for(req, &ret);
-        close(fd);
-
-        rc = (ret != EOK ? ret : rc);
-        if (rc != EOK) {
-                errno = rc;
-                return -1;
-        }
-
-        return 0;
+ * @return EOK on success or a negative error code otherwise.
+ */
+int vfs_statfs_path(const char *path, struct statfs *st)
+{
+        int file = vfs_lookup(path, 0);
+        if (file < 0)
+                return file;
+        
+        int rc = vfs_statfs(file, st);
+
+        close(file);
+
+        return rc; 
 }