Changeset 76b5a95c in mainline for uspace/app/bdsh/cmds/modules

Timestamp:

2011-03-23T20:53:30Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

71af5a4

Parents:

5716e9a (diff), ab10b842 (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.

Location:

uspace/app/bdsh/cmds/modules

Files:

• bdd/bdd.c (modified) (4 diffs)
• cat/cat.c (modified) (1 diff)
• mkfile/mkfile.c (modified) (1 diff)
• mount/mount.c (modified) (3 diffs)
• rm/rm.c (modified) (1 diff)

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

@@ -70 +70 @@
         unsigned int i, j;
         devmap_handle_t handle;
+        aoff64_t offset;
         uint8_t *blk;
         size_t size, bytes, rows;
@@ -120 +121 @@
         }
 
+        offset = ba * block_size;
+
         while (size > 0) {
                 rc = block_read_direct(handle, ba, 1, blk);
@@ -133 +136 @@
 
                 for (j = 0; j < rows; j++) {
+                        printf("[%06" PRIxOFF64 "] ", offset);
                         for (i = 0; i < BPR; i++) {
                                 if (j * BPR + i < bytes)
@@ -152 +156 @@
                                 }
                         }
+                        offset += BPR;
                         putchar('\n');
                 }

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

@@ -144 +144 @@
                         return CMD_SUCCESS;
                 case 'H':
-                        printf(cat_oops);
+                        printf("%s", cat_oops);
                         return CMD_FAILURE;
                 case 't':
-                        printf(cat_oops);
+                        printf("%s", cat_oops);
                         return CMD_FAILURE;
                 case 'b':
-                        printf(cat_oops);
+                        printf("%s", cat_oops);
                         break;
                 case 'm':
-                        printf(cat_oops);
+                        printf("%s", cat_oops);
                         return CMD_FAILURE;
                 }

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

@@ -125 +125 @@
 
         for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
-                c = getopt_long(argc, argv, "pvhVfm:", long_options, &opt_ind);
+                c = getopt_long(argc, argv, "s:h", long_options, &opt_ind);
                 switch (c) {
                 case 'h':

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)
 {
@@ -59 +66 @@
         unsigned int argc;
         const char *mopts = "";
-        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 < 4) || (argc > 5)) {
-                printf("%s: invalid number of arguments.\n",
+                printf("%s: invalid number of arguments. Try `mount --help'\n",
                     cmdname);
                 return CMD_FAILURE;

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

@@ -227 +227 @@
                 }
                 memset(buff, 0, sizeof(buff));
-                snprintf(buff, len, argv[i]);
+                snprintf(buff, len, "%s", argv[i]);
 
                 scope = rm_scope(buff);