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

Timestamp:

2013-12-25T13:05:25Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bc54126c

Parents:

f4a47e52 (diff), 6946f23 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

File:

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

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

@@ -43 +43 @@
 #include <stdio.h>
 #include <sys/stat.h>
+#include <sys/statfs.h>
 #include <sys/types.h>
 #include <ipc/services.h>
@@ -341 +342 @@
 }
 
-ssize_t read(int fildes, void *buf, size_t nbyte) 
+ssize_t read(int fildes, void *buf, size_t nbyte)
 {
         sysarg_t rc;
@@ -347 +348 @@
         aid_t req;
         
+        if (nbyte > DATA_XFER_LIMIT)
+                nbyte = DATA_XFER_LIMIT;
+        
         async_exch_t *exch = vfs_exchange_begin();
         
         req = async_send_1(exch, VFS_IN_READ, fildes, &answer);
-        rc = async_data_read_start(exch, (void *)buf, nbyte);
+        rc = async_data_read_start(exch, (void *) buf, nbyte);
         if (rc != EOK) {
                 vfs_exchange_end(exch);
@@ -376 +380 @@
         aid_t req;
         
+        if (nbyte > DATA_XFER_LIMIT)
+                nbyte = DATA_XFER_LIMIT;
+        
         async_exch_t *exch = vfs_exchange_begin();
         
         req = async_send_1(exch, VFS_IN_WRITE, fildes, &answer);
-        rc = async_data_write_start(exch, (void *)buf, nbyte);
+        rc = async_data_write_start(exch, (void *) buf, nbyte);
         if (rc != EOK) {
                 vfs_exchange_end(exch);
@@ -735 +742 @@
 }
 
+int remove(const char *path)
+{
+        return unlink(path);
+}
+
 int chdir(const char *path)
 {
@@ -892 +904 @@
 }
 
+int statfs(const char *path, struct statfs *st)
+{
+        sysarg_t rc, rc_orig;
+        aid_t req;
+        size_t pa_size;
+
+        char *pa = absolutize(path, &pa_size);
+        if (!pa)
+                return ENOMEM;
+
+        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;
+
+        rc = async_data_read_start(exch, (void *) st, sizeof(*st));
+
+exit:
+        vfs_exchange_end(exch);
+        free(pa);
+        async_wait_for(req, &rc_orig);
+        return (int) (rc_orig != EOK ? rc_orig : rc);
+}
+
 /** @}
  */