From 9164f331a37261602a2539cb1c47ecabfe4a8412 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pali=20Roh=C3=A1r?= Date: Sat, 24 Nov 2012 11:06:26 +0100 Subject: [PATCH] disk: Added function disk_dump_raw for dumping raw block device --- src/disk.c | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++++ src/disk.h | 3 ++ 2 files changed, 124 insertions(+) diff --git a/src/disk.c b/src/disk.c index dc3ec5c..c090ad6 100644 --- a/src/disk.c +++ b/src/disk.c @@ -16,11 +16,24 @@ along with this program. If not, see . */ +#include +#include + +#include +#include +#include +#include + +#include + #include "disk.h" #include "global.h" #include "image.h" #include "device.h" #include "usb-device.h" +#include "printf-utils.h" + +static char global_buf[1 << 22]; /* 4MB */ int disk_init(struct usb_device_info * dev) { @@ -38,6 +51,15 @@ enum device disk_get_device(struct usb_device_info * dev) { } +int disk_flash_raw(const char * blkdev, const char * file) { + + ERROR("Not implemented yet"); + (void)blkdev; + (void)file; + return -1; + +} + int disk_flash_image(struct usb_device_info * dev, struct image * image) { ERROR("Not implemented yet"); @@ -47,6 +69,105 @@ int disk_flash_image(struct usb_device_info * dev, struct image * image) { } +int disk_dump_raw(const char * blkdev, const char * file) { + + int fd1, fd2; + int ret; + char * path; + uint64_t blksize; + size_t need, readed; + ssize_t size; + struct stat st; + struct statvfs buf; + + printf("Dump block device %s to file %s...\n", blkdev, file); + + if ( stat(blkdev, &st) != 0 ) { + ERROR_INFO("Cannot stat block device %s", blkdev); + return -1; + } + + if ( ! S_ISBLK(st.st_mode) ) { + ERROR("Invalid block device %s", blkdev); + return -1; + } + + fd1 = open(blkdev, O_RDONLY); + + if ( fd1 < 0 ) { + ERROR_INFO("Cannot open block device %s", blkdev); + return -1; + } + + if ( ioctl(fd1, BLKGETSIZE64, &blksize) != 0 ) { + ERROR_INFO("Cannot get size of block device %s", blkdev); + close(fd1); + return -1; + } + + if ( blksize > ULLONG_MAX ) { + ERROR("Block device %s is too big", blkdev); + close(fd1); + return -1; + } + + if ( blksize == 0 ) { + ERROR("Block device %s has zero size", blkdev); + close(fd1); + return -1; + } + + path = strdup(file); + if ( ! path ) { + ALLOC_ERROR(); + close(fd1); + return -1; + } + + ret = statvfs(dirname(path), &buf); + + free(path); + + if ( ret == 0 && buf.f_bsize * buf.f_bfree < blksize ) { + ERROR("Not enought free space (have: %llu, need: %llu)", (unsigned long long int)(buf.f_bsize) * buf.f_bfree, (unsigned long long int)blksize); + close(fd1); + return -1; + } + + fd2 = creat(file, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); + + if ( fd2 < 0 ) { + ERROR_INFO("Cannot create file %s", file); + close(fd1); + return -1; + } + + readed = 0; + printf_progressbar(0, blksize); + + while ( readed < blksize ) { + need = blksize - readed; + if ( need > sizeof(global_buf) ) + need = sizeof(global_buf); + size = read(fd1, global_buf, need); + if ( size == 0 ) + break; + if ( write(fd2, global_buf, size) != size ) { + PRINTF_ERROR("Dumping image failed"); + close(fd1); + close(fd2); + return -1; + } + readed += size; + printf_progressbar(readed, blksize); + } + + close(fd1); + close(fd2); + return 0; + +} + int disk_dump_image(struct usb_device_info * dev, enum image_type image, const char * file) { ERROR("Not implemented yet"); diff --git a/src/disk.h b/src/disk.h index fc6a805..d67b208 100644 --- a/src/disk.h +++ b/src/disk.h @@ -27,6 +27,9 @@ int disk_init(struct usb_device_info * dev); enum device disk_get_device(struct usb_device_info * dev); +int disk_flash_raw(const char * blkdev, const char * file); +int disk_dump_raw(const char * blkdev, const char * file); + int disk_flash_image(struct usb_device_info * dev, struct image * image); int disk_dump_image(struct usb_device_info * dev, enum image_type image, const char * file); int disk_check_badblocks(struct usb_device_info * dev, const char * device);