Changeset 6a44ee4 in mainline for uspace/app/bdsh/cmds/modules/mount/mount.c

Timestamp:

2011-07-20T15:26:21Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

efcebe1

Parents:

25bef0ff (diff), a701812 (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 mainline changes.

File:

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

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

@@ -51 +51 @@
 {
         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);
@@ -66 +66 @@
         unsigned int argc;
         const char *mopts = "";
+        const char *dev = "";
         int rc, c, opt_ind;
 
@@ -79 +80 @@
         }
 
-        if ((argc < 4) || (argc > 5)) {
+        if ((argc < 3) || (argc > 5)) {
                 printf("%s: invalid number of arguments. Try `mount --help'\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",