Index: uspace/lib/c/generic/str.c =================================================================== --- uspace/lib/c/generic/str.c (revision 215595501bab583b756e87333edf41b81051d47b) +++ uspace/lib/c/generic/str.c (revision 45e78687c8f458584cd1e9a8882ce8b6e7371adc) @@ -839,4 +839,58 @@ 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'; + } } Index: uspace/lib/c/generic/vfs/vfs.c =================================================================== --- uspace/lib/c/generic/vfs/vfs.c (revision 215595501bab583b756e87333edf41b81051d47b) +++ uspace/lib/c/generic/vfs/vfs.c (revision 45e78687c8f458584cd1e9a8882ce8b6e7371adc) @@ -831,4 +831,65 @@ } +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; +} + /** @} */ Index: uspace/lib/c/include/ipc/vfs.h =================================================================== --- uspace/lib/c/include/ipc/vfs.h (revision 215595501bab583b756e87333edf41b81051d47b) +++ uspace/lib/c/include/ipc/vfs.h (revision 45e78687c8f458584cd1e9a8882ce8b6e7371adc) @@ -42,4 +42,5 @@ #define FS_NAME_MAXLEN 20 #define MAX_PATH_LEN (64 * 1024) +#define MAX_MNTOPTS_LEN 256 #define PLB_SIZE (2 * MAX_PATH_LEN) @@ -80,4 +81,5 @@ VFS_IN_DUP, VFS_IN_WAIT_HANDLE, + VFS_IN_MTAB_GET, } vfs_in_request_t; Index: uspace/lib/c/include/str.h =================================================================== --- uspace/lib/c/include/str.h (revision 215595501bab583b756e87333edf41b81051d47b) +++ uspace/lib/c/include/str.h (revision 45e78687c8f458584cd1e9a8882ce8b6e7371adc) @@ -91,4 +91,7 @@ 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); Index: uspace/lib/c/include/vfs/vfs.h =================================================================== --- uspace/lib/c/include/vfs/vfs.h (revision 215595501bab583b756e87333edf41b81051d47b) +++ uspace/lib/c/include/vfs/vfs.h (revision 45e78687c8f458584cd1e9a8882ce8b6e7371adc) @@ -39,6 +39,8 @@ #include #include +#include #include #include +#include "vfs_mtab.h" enum vfs_change_state_type { @@ -55,4 +57,5 @@ extern int fd_wait(void); +extern int get_mtab_list(list_t *mtab_list); extern async_exch_t *vfs_exchange_begin(void); Index: uspace/lib/c/include/vfs/vfs_mtab.h =================================================================== --- uspace/lib/c/include/vfs/vfs_mtab.h (revision 45e78687c8f458584cd1e9a8882ce8b6e7371adc) +++ uspace/lib/c/include/vfs/vfs_mtab.h (revision 45e78687c8f458584cd1e9a8882ce8b6e7371adc) @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2011 Maurizio Lombardi + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_VFS_MTAB_H_ +#define LIBC_VFS_MTAB_H_ + +#include +#include +#include + +typedef struct mtab_ent { + link_t link; + char mp[MAX_PATH_LEN]; + char opts[MAX_MNTOPTS_LEN]; + char fs_name[FS_NAME_MAXLEN]; + unsigned int instance; + service_id_t service_id; +} mtab_ent_t; + +#endif + +/** @} + */ Index: uspace/lib/drv/generic/driver.c =================================================================== --- uspace/lib/drv/generic/driver.c (revision 215595501bab583b756e87333edf41b81051d47b) +++ uspace/lib/drv/generic/driver.c (revision 45e78687c8f458584cd1e9a8882ce8b6e7371adc) @@ -970,5 +970,5 @@ 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);