Changeset b14d9f9 in mainline for uspace/lib/c

Timestamp:

2017-05-05T17:37:36Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

951f6b9e

Parents:

75b24cd

Message:

Mount should be able to print the list of available file system types.

Location:

uspace/lib/c

Files:

• generic/str_error.c (modified) (1 diff)
• generic/vfs/vfs.c (modified) (1 diff)
• include/errno.h (modified) (1 diff)
• include/ipc/vfs.h (modified) (1 diff)
• include/vfs/vfs.h (modified) (2 diffs)

uspace/lib/c/generic/str_error.c

@@ -72 +72 @@
         // FIXME: integrate these as first-class error values
         switch (e) {
+                case ENOFS:
+                        return "No such file system type";
                 case EBADCHECKSUM:
                         return "Bad checksum";

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

@@ -346 +346 @@
         
         return loc_service_connect(stat.service, iface, 0);
+}
+
+/** Return a list of currently available file system types
+ *
+ * @param fstypes Points to structure where list of filesystem types is
+ *        stored. It is read as a null-terminated list of strings
+ *        fstypes->fstypes[0..]. To free the list use vfs_fstypes_free().
+ *
+ * @return                      EOK on success or a negative error code
+ */
+int vfs_fstypes(vfs_fstypes_t *fstypes)
+{
+        sysarg_t size;
+        char *buf;
+        char dummybuf[1];
+        size_t count, i;
+
+        async_exch_t *exch = vfs_exchange_begin();
+        int rc = async_req_0_1(exch, VFS_IN_FSTYPES, &size);
+
+        if (rc != EOK) {
+                vfs_exchange_end(exch);
+                return rc;
+        }
+
+        buf = malloc(size);
+        if (buf == NULL) {
+                buf = dummybuf;
+                size = 1;
+        }
+
+        rc = async_data_read_start(exch, buf, size);
+        vfs_exchange_end(exch);
+
+        if (buf == dummybuf)
+                return ENOMEM;
+
+        /*
+         * Buffer should contain a number of null-terminated strings.
+         * Count them so that we can allocate an index
+         */
+        count = 0;
+        i = 0;
+        while (i < size) {
+                if (buf[i] == '\0')
+                        ++count;
+                ++i;
+        }
+
+        if (count == 0) {
+                free(buf);
+                return EIO;
+        }
+
+        fstypes->fstypes = calloc(sizeof(char *), count + 1);
+        if (fstypes->fstypes == NULL) {
+                free(buf);
+                return ENOMEM;
+        }
+
+        /* Now fill the index */
+        if (buf[0] != '\0')
+                fstypes->fstypes[0] = &buf[0];
+        count = 0;
+        i = 0;
+        while (i < size) {
+                if (buf[i] == '\0')
+                        fstypes->fstypes[++count] = &buf[i + 1];
+                ++i;
+        }
+        fstypes->fstypes[count] = NULL;
+        fstypes->buf = buf;
+        fstypes->size = size;
+
+        return rc;
+}
+
+/** Free list of file system types.
+ *
+ * @param fstypes List of file system types
+ */
+void vfs_fstypes_free(vfs_fstypes_t *fstypes)
+{
+        free(fstypes->buf);
+        fstypes->buf = NULL;
+        free(fstypes->fstypes);
+        fstypes->fstypes = NULL;
+        fstypes->size = 0;
 }
 

uspace/lib/c/include/errno.h

@@ -55 +55 @@
 #define EMLINK        (-267)
 #define ENXIO         (-268)
+#define ENOFS         (-269)
 
 /** Bad checksum. */

uspace/lib/c/include/ipc/vfs.h

@@ -64 +64 @@
 typedef enum {
         VFS_IN_CLONE = IPC_FIRST_USER_METHOD,
+        VFS_IN_FSTYPES,
         VFS_IN_MOUNT,
         VFS_IN_OPEN,

uspace/lib/c/include/vfs/vfs.h

@@ -73 +73 @@
 };
 
+/** List of file system types */
+typedef struct {
+        char **fstypes;
+        char *buf;
+        size_t size;
+} vfs_fstypes_t;
+
 extern int vfs_fhandle(FILE *, int *);
 
@@ -81 +88 @@
 extern async_exch_t *vfs_exchange_begin(void);
 extern void vfs_exchange_end(async_exch_t *);
+extern int vfs_fstypes(vfs_fstypes_t *);
+extern void vfs_fstypes_free(vfs_fstypes_t *);
 extern int vfs_link(int, const char *, vfs_file_kind_t, int *);
 extern int vfs_link_path(const char *, vfs_file_kind_t, int *);