Changeset 45e7868 in mainline for uspace/lib

Timestamp:

2011-11-07T23:02:28Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

8c62a71

Parents:

a0c05e7 (diff), 7b5f4c9 (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 from mainline.

Location:

uspace/lib

Files:

• c/generic/str.c (modified) (1 diff)
• c/generic/vfs/vfs.c (modified) (1 diff)
• c/include/ipc/vfs.h (modified) (2 diffs)
• c/include/str.h (modified) (1 diff)
• c/include/vfs/vfs.h (modified) (2 diffs)
• c/include/vfs/vfs_mtab.h (added)
• drv/generic/driver.c (modified) (1 diff)

uspace/lib/c/generic/str.c

@@ -839 +839 @@
         
         return NULL;
+}
+
+/** Removes specified trailing characters from a string.
+ *
+ * @param str String to remove from.
+ * @param ch  Character to remove.
+ */
+void str_rtrim(char *str, wchar_t ch)
+{
+        size_t off = 0;
+        size_t pos = 0;
+        wchar_t c;
+        bool update_last_chunk = true;
+        char *last_chunk = NULL;
+
+        while ((c = str_decode(str, &off, STR_NO_LIMIT))) {
+                if (c != ch) {
+                        update_last_chunk = true;
+                        last_chunk = NULL;
+                } else if (update_last_chunk) {
+                        update_last_chunk = false;
+                        last_chunk = (str + pos);
+                }
+                pos = off;
+        }
+
+        if (last_chunk)
+                *last_chunk = '\0';
+}
+
+/** Removes specified leading characters from a string.
+ *
+ * @param str String to remove from.
+ * @param ch  Character to remove.
+ */
+void str_ltrim(char *str, wchar_t ch)
+{
+        wchar_t acc;
+        size_t off = 0;
+        size_t pos = 0;
+        size_t str_sz = str_size(str);
+
+        while ((acc = str_decode(str, &off, STR_NO_LIMIT)) != 0) {
+                if (acc != ch)
+                        break;
+                else
+                        pos = off;
+        }
+
+        if (pos > 0) {
+                memmove(str, &str[pos], str_sz - pos);
+                pos = str_sz - pos;
+                str[str_sz - pos] = '\0';
+        }
 }
 

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

@@ -831 +831 @@
 }
 
+int get_mtab_list(list_t *mtab_list)
+{
+        sysarg_t rc;
+        aid_t req;
+        size_t i;
+        sysarg_t num_mounted_fs;
+        
+        async_exch_t *exch = vfs_exchange_begin();
+
+        req = async_send_0(exch, VFS_IN_MTAB_GET, NULL);
+
+        /* Ask VFS how many filesystems are mounted */
+        rc = async_req_0_1(exch, VFS_IN_PING, &num_mounted_fs);
+        if (rc != EOK)
+                goto exit;
+
+        for (i = 0; i < num_mounted_fs; ++i) {
+                mtab_ent_t *mtab_ent;
+
+                mtab_ent = malloc(sizeof(mtab_ent_t));
+                if (!mtab_ent) {
+                        rc = ENOMEM;
+                        goto exit;
+                }
+
+                memset(mtab_ent, 0, sizeof(mtab_ent_t));
+
+                rc = async_data_read_start(exch, (void *) mtab_ent->mp,
+                    MAX_PATH_LEN);
+                if (rc != EOK)
+                        goto exit;
+
+                rc = async_data_read_start(exch, (void *) mtab_ent->opts,
+                        MAX_MNTOPTS_LEN);
+                if (rc != EOK)
+                        goto exit;
+
+                rc = async_data_read_start(exch, (void *) mtab_ent->fs_name,
+                        FS_NAME_MAXLEN);
+                if (rc != EOK)
+                        goto exit;
+
+                sysarg_t p[2];
+
+                rc = async_req_0_2(exch, VFS_IN_PING, &p[0], &p[1]);
+                if (rc != EOK)
+                        goto exit;
+
+                mtab_ent->instance = p[0];
+                mtab_ent->service_id = p[1];
+
+                link_initialize(&mtab_ent->link);
+                list_append(&mtab_ent->link, mtab_list);
+        }
+
+exit:
+        async_wait_for(req, &rc);
+        vfs_exchange_end(exch);
+        return rc;
+}
+
 /** @}
  */

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

@@ -42 +42 @@
 #define FS_NAME_MAXLEN  20
 #define MAX_PATH_LEN    (64 * 1024)
+#define MAX_MNTOPTS_LEN 256
 #define PLB_SIZE        (2 * MAX_PATH_LEN)
 
@@ -80 +81 @@
         VFS_IN_DUP,
         VFS_IN_WAIT_HANDLE,
+        VFS_IN_MTAB_GET,
 } vfs_in_request_t;
 

uspace/lib/c/include/str.h

@@ -91 +91 @@
 extern char *str_rchr(const char *str, wchar_t ch);
 
+extern void str_rtrim(char *str, wchar_t ch);
+extern void str_ltrim(char *str, wchar_t ch);
+
 extern bool wstr_linsert(wchar_t *str, wchar_t ch, size_t pos, size_t max_pos);
 extern bool wstr_remove(wchar_t *str, size_t pos);

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

@@ -39 +39 @@
 #include <ipc/vfs.h>
 #include <ipc/loc.h>
+#include <adt/list.h>
 #include <stdio.h>
 #include <async.h>
+#include "vfs_mtab.h"
 
 enum vfs_change_state_type {
@@ -55 +57 @@
 
 extern int fd_wait(void);
+extern int get_mtab_list(list_t *mtab_list);
 
 extern async_exch_t *vfs_exchange_begin(void);

uspace/lib/drv/generic/driver.c

@@ -970 +970 @@
         
         match_id->id = str_dup(match_id_str);
-        match_id->score = 90;
+        match_id->score = match_score;
         
         add_match_id(&fun->match_ids, match_id);