Changeset b14d9f9 in mainline for uspace/app/bdsh/cmds/modules/mount/mount.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.

File:

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

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

@@ -49 +49 @@
         { "help", no_argument, 0, 'h' },
         { "instance", required_argument, 0, 'i' },
+        { "types", no_argument, 0, 't' },
         { 0, 0, 0, 0 }
 };
@@ -57 +58 @@
 {
         static char helpfmt[] =
-            "Usage:  %s <fstype> <mp> [dev] [<moptions>]\n";
+            "Usage:  %s <fstype> <mp> [dev] [<moptions>]\n"
+            "Options:\n"
+            "  -h, --help       A short option summary\n"
+            "  -i, --instance ## Mount a specific instance\n"
+            "  -t, --types      List available file system types\n";
+
         if (level == HELP_SHORT) {
                 printf("'%s' mounts a file system.\n", cmdname);
@@ -101 +107 @@
 }
 
+static void print_fstypes(void)
+{
+        int rc;
+        vfs_fstypes_t fstypes;
+        char **p;
+
+        rc = vfs_fstypes(&fstypes);
+        if (rc != EOK) {
+                printf("Error getting list of available file system types.\n");
+                return;
+        }
+
+        printf("Available file system types:\n");
+        p = fstypes.fstypes;
+        while (*p != NULL)
+                printf("\t%s\n", *p++);
+        vfs_fstypes_free(&fstypes);
+}
+
 /* Main entry point for mount, accepts an array of arguments */
 int cmd_mount(char **argv)
@@ -115 +140 @@
 
         for (c = 0, optreset = 1, optind = 0, opt_ind = 0; c != -1;) {
-                c = getopt_long(argc, argv, "i:h", long_options, &opt_ind);
+                c = getopt_long(argc, argv, "i:ht", long_options, &opt_ind);
                 switch (c) {
                 case 'h':
@@ -124 +149 @@
                         instance_set = true;
                         break;
+                case 't':
+                        print_fstypes();
+                        return CMD_SUCCESS;
                 }
         }
@@ -151 +179 @@
                 printf("Unable to mount %s filesystem to %s on %s (rc=%s)\n",
                     t_argv[2], t_argv[1], t_argv[3], str_error(rc));
+                if (rc == ENOFS)
+                        print_fstypes();
                 return CMD_FAILURE;
         }