Changeset 4f100f4 in mainline for uspace/app/bdsh/cmds/modules/mount

Timestamp:

2011-11-06T16:58:23Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

41047bf

Parents:

3ce78580 (diff), 460514d (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 support for listing mounted file systems.

File:

• uspace/app/bdsh/cmds/modules/mount/mount.c (modified) (3 diffs)

uspace/app/bdsh/cmds/modules/mount/mount.c

@@ -30 +30 @@
 #include <stdlib.h>
 #include <vfs/vfs.h>
+#include <adt/list.h>
 #include <errno.h>
 #include <getopt.h>
@@ -60 +61 @@
         }
         return;
+}
+
+static void print_mtab_list(void)
+{
+        LIST_INITIALIZE(mtab_list);
+        get_mtab_list(&mtab_list);
+
+        mtab_ent_t *old_ent = NULL;
+
+        list_foreach(mtab_list, cur) {
+                mtab_ent_t *mtab_ent = list_get_instance(cur, mtab_ent_t,
+                    link);
+
+                if (old_ent)
+                        free(old_ent);
+
+                old_ent = mtab_ent;
+
+                printf("%s on %s ", mtab_ent->fs_name, mtab_ent->mp);
+
+                if (str_size(mtab_ent->opts) > 0)
+                        printf("opts=%s ", mtab_ent->opts);
+
+                printf("(instance=%d, service_id=%" PRIu64 ")\n",
+                    mtab_ent->instance, mtab_ent->service_id);
+        }
+
+        if (old_ent)
+                free(old_ent);
 }
 
@@ -94 +124 @@
                 t_argv = &argv[0];
 
-        if ((argc < 3) || (argc > 5)) {
+        if ((argc == 2) || (argc > 5)) {
                 printf("%s: invalid number of arguments. Try `mount --help'\n",
                     cmdname);
                 return CMD_FAILURE;
+        }
+        if (argc == 1) {
+                print_mtab_list();
+                return CMD_SUCCESS;
         }
         if (argc > 3)