Index: .bzrignore =================================================================== --- .bzrignore (revision cb15135a169187330f7eab65cd41de6f1250963c) +++ .bzrignore (revision 32d3ebf33d92d44fc74b24a962cae310516440ae) @@ -49,4 +49,5 @@ uspace/app/websrv/websrv uspace/dist/app/bdsh +uspace/dist/app/blkdump uspace/dist/app/edit uspace/dist/app/getterm Index: boot/Makefile.common =================================================================== --- boot/Makefile.common (revision cb15135a169187330f7eab65cd41de6f1250963c) +++ boot/Makefile.common (revision 32d3ebf33d92d44fc74b24a962cae310516440ae) @@ -126,4 +126,5 @@ RD_APPS_NON_ESSENTIAL = \ + $(USPACE_PATH)/app/blkdump/blkdump \ $(USPACE_PATH)/app/edit/edit \ $(USPACE_PATH)/app/kill/kill \ Index: uspace/Makefile =================================================================== --- uspace/Makefile (revision cb15135a169187330f7eab65cd41de6f1250963c) +++ uspace/Makefile (revision 32d3ebf33d92d44fc74b24a962cae310516440ae) @@ -35,4 +35,5 @@ DIRS = \ app/bdsh \ + app/blkdump \ app/edit \ app/getterm \ Index: uspace/app/blkdump/Makefile =================================================================== --- uspace/app/blkdump/Makefile (revision 32d3ebf33d92d44fc74b24a962cae310516440ae) +++ uspace/app/blkdump/Makefile (revision 32d3ebf33d92d44fc74b24a962cae310516440ae) @@ -0,0 +1,38 @@ +# +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +USPACE_PREFIX = ../.. +LIBS = $(LIBBLOCK_PREFIX)/libblock.a +EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) +BINARY = blkdump + +SOURCES = \ + blkdump.c + +include $(USPACE_PREFIX)/Makefile.common Index: uspace/app/blkdump/blkdump.c =================================================================== --- uspace/app/blkdump/blkdump.c (revision 32d3ebf33d92d44fc74b24a962cae310516440ae) +++ uspace/app/blkdump/blkdump.c (revision 32d3ebf33d92d44fc74b24a962cae310516440ae) @@ -0,0 +1,228 @@ +/* + * Copyright (c) 2011 Martin Sucha + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup fs + * @{ + */ + +/** + * @file blockdump.c + * @brief Tool for dumping content of block devices + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define NAME "blkdump" + +static void syntax_print(void); +static void print_hex_row(uint8_t *data, size_t length, size_t bytes_per_row); + +int main(int argc, char **argv) +{ + + int rc; + char *dev_path; + devmap_handle_t handle; + size_t block_size; + char *endptr; + aoff64_t block_offset = 0; + aoff64_t block_count = 1; + aoff64_t dev_nblocks; + uint8_t *data; + size_t data_offset; + aoff64_t current; + aoff64_t limit; + + if (argc < 2) { + printf(NAME ": Error, argument missing.\n"); + syntax_print(); + return 1; + } + + --argc; ++argv; + + if (str_cmp(*argv, "--offset") == 0) { + --argc; ++argv; + if (*argv == NULL) { + printf(NAME ": Error, argument missing (offset).\n"); + syntax_print(); + return 1; + } + + block_offset = strtol(*argv, &endptr, 10); + if (*endptr != '\0') { + printf(NAME ": Error, invalid argument (offset).\n"); + syntax_print(); + return 1; + } + + --argc; ++argv; + } + + if (str_cmp(*argv, "--count") == 0) { + --argc; ++argv; + if (*argv == NULL) { + printf(NAME ": Error, argument missing (count).\n"); + syntax_print(); + return 1; + } + + block_count = strtol(*argv, &endptr, 10); + if (*endptr != '\0') { + printf(NAME ": Error, invalid argument (count).\n"); + syntax_print(); + return 1; + } + + --argc; ++argv; + } + + if (argc != 1) { + printf(NAME ": Error, unexpected argument.\n"); + syntax_print(); + return 1; + } + + dev_path = *argv; + + rc = devmap_device_get_handle(dev_path, &handle, 0); + if (rc != EOK) { + printf(NAME ": Error resolving device `%s'.\n", dev_path); + return 2; + } + + rc = block_init(handle, 2048); + if (rc != EOK) { + printf(NAME ": Error initializing libblock.\n"); + return 2; + } + + rc = block_get_bsize(handle, &block_size); + if (rc != EOK) { + printf(NAME ": Error determining device block size.\n"); + return 2; + } + + rc = block_get_nblocks(handle, &dev_nblocks); + if (rc != EOK) { + printf(NAME ": Warning, failed to obtain block device size.\n"); + } + + printf("Device %s has %" PRIuOFF64 " blocks, %u bytes each\n", dev_path, dev_nblocks, block_size); + + data = malloc(block_size); + if (data == NULL) { + printf(NAME ": Error allocating data buffer of %u bytes", block_size); + block_fini(handle); + return 3; + } + + limit = block_offset + block_count; + for (current = block_offset; current < limit; current++) { + rc = block_read_direct(handle, current, 1, data); + if (rc != EOK) { + printf(NAME ": Error reading block at %" PRIuOFF64 " \n", current); + free(data); + return 3; + } + + printf("---- Block %" PRIuOFF64 " (at %" PRIuOFF64 ") ----\n", current, current*block_size); + + for (data_offset = 0; data_offset < block_size; data_offset += 16) { + printf("%8" PRIxOFF64 ": ", current+data_offset); + print_hex_row(data+data_offset, block_size-data_offset, 16); + printf("\n"); + } + printf("\n"); + } + + free(data); + + block_fini(handle); + + return 0; +} + +/** + * Print a row of 16 bytes as commonly seen in hexadecimal dumps + */ +static void print_hex_row(uint8_t *data, size_t length, size_t bytes_per_row) { + size_t pos; + uint8_t b; + + if (length > bytes_per_row) { + length = bytes_per_row; + } + + // Print hexadecimal values + for (pos = 0; pos < length; pos++) { + printf("%02hhX ", data[pos]); + if (pos == length/2) { + printf(" "); + } + } + + // pad with spaces if we have less than 16 bytes + for (pos = length; pos < bytes_per_row; pos++) { + printf(" "); + if (pos == length/2) { + printf(" "); + } + } + + // Print printable characters + for (pos = 0; pos < length; pos++) { + b = data[pos]; + if (b >= 32 && b < 128) { + putchar(b); + } + else { + putchar('.'); + } + } +} + +static void syntax_print(void) +{ + printf("syntax: blkdump [--offset ] [--count ] \n"); +} + +/** + * @} + */