Changeset 45e7868 in mainline for uspace/app/bdsh/cmds/modules/mount/mount.c

Timestamp:

2011-11-07T23:02:28Z (13 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.

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>
+#include <inttypes.h>
 #include "config.h"
 #include "util.h"
@@ -60 +62 @@
         }
         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", mtab_ent->fs_name);
+                if (mtab_ent->instance)
+                        printf("/%d", mtab_ent->instance);
+                printf(" on %s ", mtab_ent->mp);
+
+                if (str_size(mtab_ent->opts) > 0)
+                        printf("opts=%s ", mtab_ent->opts);
+
+                printf("(service=%" PRIun ")\n", mtab_ent->service_id);
+        }
+
+        if (old_ent)
+                free(old_ent);
 }
 
@@ -94 +127 @@
                 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)