valentineus/0xFFFF
1
Fork 0
Code Releases Activity

disk: Respect -s (simulate) flag for dump -e operation

Browse Source
This commit is contained in:
Pali Rohár committed 2021-05-01 20:38:26 +02:00
1 parent 670db0d169
commit bbf438e1a8
1 file changed
+22 -14
Download Patch File Download Diff File Expand all files Collapse all files
src/disk.c
+22 -14
View File
@@ -118,7 +118,7 @@ int disk_open_dev(int maj, int min, int partition, int readonly) {
blkdev[len] = 0; blkdev[len] = 0;
fd = open(blkdev, (readonly ? O_RDONLY : O_RDWR) | O_EXCL | O_NONBLOCK); fd = open(blkdev, ((simulate || readonly) ? O_RDONLY : O_RDWR) | O_EXCL | O_NONBLOCK);
if ( fd < 0 ) { if ( fd < 0 ) {
ERROR_INFO("Cannot open block device %s", blkdev); ERROR_INFO("Cannot open block device %s", blkdev);
return -1; return -1;
@@ -144,13 +144,13 @@ int disk_open_dev(int maj, int min, int partition, int readonly) {
ERROR("Block device name is too long"); ERROR("Block device name is too long");
return -1; return -1;
} }
fd = open(blkdev, (readonly ? O_RDONLY : O_RDWR) | O_EXCL); fd = open(blkdev, ((simulate || readonly) ? O_RDONLY : O_RDWR) | O_EXCL);
if ( fd < 0 && errno == ENOENT ) { if ( fd < 0 && errno == ENOENT ) {
if ( snprintf(blkdev+len, sizeof(blkdev)-len, "%d", partition) >= (int)(sizeof(blkdev)-len) ) { if ( snprintf(blkdev+len, sizeof(blkdev)-len, "%d", partition) >= (int)(sizeof(blkdev)-len) ) {
ERROR("Block device name is too long"); ERROR("Block device name is too long");
return -1; return -1;
} }
fd = open(blkdev, (readonly ? O_RDONLY : O_RDWR) | O_EXCL); fd = open(blkdev, ((simulate || readonly) ? O_RDONLY : O_RDWR) | O_EXCL);
} }
if ( fd < 0 && errno == ENOENT ) { if ( fd < 0 && errno == ENOENT ) {
blkdev[len] = 0; blkdev[len] = 0;
@@ -201,7 +201,7 @@ int disk_open_dev(int maj, int min, int partition, int readonly) {
int disk_dump_dev(int fd, const char * file) { int disk_dump_dev(int fd, const char * file) {
int fd2; int fd2 = -1;
int ret; int ret;
char * path; char * path;
uint64_t blksize; uint64_t blksize;
@@ -253,11 +253,15 @@ int disk_dump_dev(int fd, const char * file) {
return -1; return -1;
} }
fd2 = creat(file, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); if ( ! simulate ) {
fd2 = creat(file, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
if ( fd2 < 0 ) {
ERROR_INFO("Cannot create file %s", file);
return -1;
}
if ( fd2 < 0 ) {
ERROR_INFO("Cannot create file %s", file);
return -1;
} }
sent = 0; sent = 0;
@@ -272,19 +276,23 @@ int disk_dump_dev(int fd, const char * file) {
break; break;
if ( size < 0 ) { if ( size < 0 ) {
PRINTF_ERROR("Reading from block device failed"); PRINTF_ERROR("Reading from block device failed");
close(fd2); if ( ! simulate )
close(fd2);
return -1; return -1;
} }
if ( write(fd2, global_buf, size) != size ) { if ( ! simulate ) {
PRINTF_ERROR("Dumping image failed"); if ( write(fd2, global_buf, size) != size ) {
close(fd2); PRINTF_ERROR("Dumping image failed");
return -1; close(fd2);
return -1;
}
} }
sent += size; sent += size;
printf_progressbar(sent, blksize); printf_progressbar(sent, blksize);
} }
close(fd2); if ( ! simulate )
close(fd2);
return 0; return 0;
} }