Changeset 2ecc9d4 in mainline

Timestamp:

2010-11-23T15:16:53Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

a4b92fb

Parents:

8b3bff5

Message:

Make dev (3rd) argument for mount command in bdsh optional. This allows to mount e.g. tmpfs with no device as it is not possible to pass empty string as an argument in bdsh yet

File:

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

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

@@ -44 +44 @@
 {
         static char helpfmt[] =
-            "Usage:  %s <fstype> <mp> <dev> [<moptions>]\n";
+            "Usage:  %s <fstype> <mp> [dev] [<moptions>]\n";
         if (level == HELP_SHORT) {
                 printf("'%s' mounts a file system.\n", cmdname);
@@ -59 +59 @@
         unsigned int argc;
         const char *mopts = "";
+        const char *dev = "";
         int rc;
 
         argc = cli_count_args(argv);
 
-        if ((argc < 4) || (argc > 5)) {
+        if ((argc < 3) || (argc > 5)) {
                 printf("%s: invalid number of arguments.\n",
                     cmdname);
                 return CMD_FAILURE;
         }
+        if (argc > 3)
+                dev = argv[3];
         if (argc == 5)
                 mopts = argv[4];
 
-        rc = mount(argv[1], argv[2], argv[3], mopts, 0);
+        rc = mount(argv[1], argv[2], dev, mopts, 0);
         if (rc != EOK) {
                 printf("Unable to mount %s filesystem to %s on %s (rc=%d)\n",