i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Enlarged the arbitrary maximum image size to 4 GB which still works just

Browse Source 
fine.
* Minor cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28312 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2008-10-24 11:14:49 +00:00
parent 528b69d508
commit 500d847a1d
1 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tools/vmdkimage/vmdkimage.cpp
+25 -25
View File
@@ -145,8 +145,8 @@ is_valid_uuid(const char *uuid)
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
uint64 headersize = 0; uint64 headerSize = 0;
uint64 imagesize = 0; uint64 imageSize = 0;
const char *file = NULL; const char *file = NULL;
const char *uuid = NULL; const char *uuid = NULL;
bool headerOnly = false; bool headerOnly = false;
@@ -183,23 +183,23 @@ main(int argc, char *argv[])
break; break;
case 'h': case 'h':
headersize = strtoull(optarg, NULL, 10); headerSize = strtoull(optarg, NULL, 10);
if (strchr(optarg, 'G') || strchr(optarg, 'g')) if (strchr(optarg, 'G') || strchr(optarg, 'g'))
headersize *= 1024 * 1024 * 1024; headerSize *= 1024 * 1024 * 1024;
else if (strchr(optarg, 'M') || strchr(optarg, 'm')) else if (strchr(optarg, 'M') || strchr(optarg, 'm'))
headersize *= 1024 * 1024; headerSize *= 1024 * 1024;
else if (strchr(optarg, 'K') || strchr(optarg, 'k')) else if (strchr(optarg, 'K') || strchr(optarg, 'k'))
headersize *= 1024; headerSize *= 1024;
break; break;
case 'i': case 'i':
imagesize = strtoull(optarg, NULL, 10); imageSize = strtoull(optarg, NULL, 10);
if (strchr(optarg, 'G') || strchr(optarg, 'g')) if (strchr(optarg, 'G') || strchr(optarg, 'g'))
imagesize *= 1024 * 1024 * 1024; imageSize *= 1024 * 1024 * 1024;
else if (strchr(optarg, 'M') || strchr(optarg, 'm')) else if (strchr(optarg, 'M') || strchr(optarg, 'm'))
imagesize *= 1024 * 1024; imageSize *= 1024 * 1024;
else if (strchr(optarg, 'K') || strchr(optarg, 'k')) else if (strchr(optarg, 'K') || strchr(optarg, 'k'))
imagesize *= 1024; imageSize *= 1024;
break; break;
case 'u': case 'u':
@@ -236,36 +236,36 @@ main(int argc, char *argv[])
return 0; return 0;
} }
if (!headersize || !imagesize || !file) if (!headerSize || !imageSize || !file)
print_usage(); print_usage();
char desc[1024]; char desc[1024];
SparseExtentHeader header; SparseExtentHeader header;
if (headersize < sizeof(desc) + sizeof(header)) { if (headerSize < sizeof(desc) + sizeof(header)) {
fprintf(stderr, "Error: header size must be at least %u byte\n", fprintf(stderr, "Error: header size must be at least %u byte\n",
(unsigned)(sizeof(desc) + sizeof(header))); (unsigned)(sizeof(desc) + sizeof(header)));
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
if (headersize % 512) { if (headerSize % 512) {
fprintf(stderr, "Error: header size must be a multiple of 512 bytes\n"); fprintf(stderr, "Error: header size must be a multiple of 512 bytes\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
if (imagesize % 512) { if (imageSize % 512) {
fprintf(stderr, "Error: image size must be a multiple of 512 bytes\n"); fprintf(stderr, "Error: image size must be a multiple of 512 bytes\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
// arbitrary 1 GB limitation // arbitrary 1 GB limitation
if (headersize > 0x40000000u) { if (headerSize > 0x40000000ULL) {
fprintf(stderr, "Error: header size too large\n"); fprintf(stderr, "Error: header size too large\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
// arbitrary 2 GB limitation // arbitrary 4 GB limitation
if (imagesize > 0x80000000u) { if (imageSize > 0x100000000ULL) {
fprintf(stderr, "Error: image size too large\n"); fprintf(stderr, "Error: image size too large\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
@@ -273,8 +273,8 @@ main(int argc, char *argv[])
const char *name = strrchr(file, '/'); const char *name = strrchr(file, '/');
name = name ? (name + 1) : file; name = name ? (name + 1) : file;
// printf("headersize %llu\n", headersize); // printf("headerSize %llu\n", headerSize);
// printf("imagesize %llu\n", imagesize); // printf("imageSize %llu\n", imageSize);
// printf("file %s\n", file); // printf("file %s\n", file);
uint64 sectors; uint64 sectors;
@@ -284,7 +284,7 @@ main(int argc, char *argv[])
// TODO: fixme! // TODO: fixme!
sectors = 63; sectors = 63;
heads = 16; heads = 16;
cylinders = imagesize / (sectors * heads * 512); cylinders = imageSize / (sectors * heads * 512);
while (cylinders > 1024) { while (cylinders > 1024) {
cylinders /= 2; cylinders /= 2;
heads *= 2; heads *= 2;
@@ -304,7 +304,7 @@ main(int argc, char *argv[])
header.numGTEsPerGT = 512; header.numGTEsPerGT = 512;
header.rgdOffset = 0; header.rgdOffset = 0;
header.gdOffset = 0; header.gdOffset = 0;
header.overHead = headersize / 512; header.overHead = headerSize / 512;
header.uncleanShutdown = 0; header.uncleanShutdown = 0;
header.singleEndLineChar = '\n'; header.singleEndLineChar = '\n';
header.nonEndLineChar = ' '; header.nonEndLineChar = ' ';
@@ -345,7 +345,7 @@ main(int argc, char *argv[])
sprintf(desc + strlen(desc), sprintf(desc + strlen(desc),
"# Extent Description\n" "# Extent Description\n"
"RW %llu FLAT \"%s\" %llu\n", "RW %llu FLAT \"%s\" %llu\n",
actualImageSize / 512, name, headersize / 512); actualImageSize / 512, name, headerSize / 512);
sprintf(desc + strlen(desc), sprintf(desc + strlen(desc),
"# Disk Data Base\n" "# Disk Data Base\n"
"ddb.toolsVersion = \"0\"\n" "ddb.toolsVersion = \"0\"\n"
@@ -376,15 +376,15 @@ main(int argc, char *argv[])
if (write(fd, desc, sizeof(desc)) != sizeof(desc)) if (write(fd, desc, sizeof(desc)) != sizeof(desc))
goto write_err; goto write_err;
if ((uint64)lseek(fd, headersize - 1, SEEK_SET) != headersize - 1) if ((uint64)lseek(fd, headerSize - 1, SEEK_SET) != headerSize - 1)
goto write_err; goto write_err;
if (1 != write(fd, "", 1)) if (1 != write(fd, "", 1))
goto write_err; goto write_err;
if (!headerOnly) { if (!headerOnly) {
if (clearImage && ftruncate(fd, headersize) != 0 if (clearImage && ftruncate(fd, headerSize) != 0
|| ftruncate(fd, actualImageSize + headersize) != 0) { || ftruncate(fd, actualImageSize + headerSize) != 0) {
fprintf(stderr, "Error: resizing file %s failed (%s)\n", file, fprintf(stderr, "Error: resizing file %s failed (%s)\n", file,
strerror(errno)); strerror(errno));
exit(EXIT_FAILURE); exit(EXIT_FAILURE);