Changeset 5e3eea10 in mainline for uspace/app/bdsh/cmds/modules

Timestamp:

2011-03-22T19:55:06Z (15 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

e7ffdd3

Parents:

c3f95d8 (diff), 432f68a (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)
• 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/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);