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

Timestamp:

2011-03-13T11:39:00Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

5e3eea10

Parents:

f8c60f5 (diff), c1a5d8d (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:

Merged mainline changes

File:

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

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

@@ -31 +31 @@
 #include <vfs/vfs.h>
 #include <errno.h>
+#include <getopt.h>
 #include "config.h"
 #include "util.h"
@@ -40 +41 @@
 static const char *cmdname = "mount";
 
-/* Dispays help for mount in various levels */
+static struct option const long_options[] = {
+        { "help", no_argument, 0, 'h' },
+        { 0, 0, 0, 0 }
+};
+
+
+/* Displays help for mount in various levels */
 void help_cmd_mount(unsigned int level)
 {
@@ -60 +67 @@
         const char *mopts = "";
         const char *dev = "";
-        int rc;
+        int rc, c, opt_ind;
 
         argc = cli_count_args(argv);
 
+        for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
+                c = getopt_long(argc, argv, "h", long_options, &opt_ind);
+                switch (c) {
+                case 'h':
+                        help_cmd_mount(HELP_LONG);
+                        return CMD_SUCCESS;
+                }
+        }
+
         if ((argc < 3) || (argc > 5)) {
-                printf("%s: invalid number of arguments.\n",
+                printf("%s: invalid number of arguments. Try `mount --help'\n",
                     cmdname);
                 return CMD_FAILURE;