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

* The image was create one byte too short. Fixes #2722.

Browse Source 
* Automatic whitespace cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27472 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2008-09-13 10:04:51 +00:00
parent 57b9debf76
commit 034fb25c4d
1 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tools/vmdkimage/vmdkimage.cpp
+27 -28
View File
@@ -48,24 +48,24 @@ main(int argc, char *argv[])
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
while (1) { while (1) {
int c; int c;
static struct option long_options[] = static struct option long_options[] =
{ {
{"headersize", required_argument, 0, 'h'}, {"headersize", required_argument, 0, 'h'},
{"imagesize", required_argument, 0, 'i'}, {"imagesize", required_argument, 0, 'i'},
{"file", required_argument, 0, 'f'}, {"file", required_argument, 0, 'f'},
{"clear-image", no_argument, 0, 'c'}, {"clear-image", no_argument, 0, 'c'},
{"header-only", no_argument, 0, 'H'}, {"header-only", no_argument, 0, 'H'},
{0, 0, 0, 0} {0, 0, 0, 0}
}; };
opterr = 0; /* don't print errors */ opterr = 0; /* don't print errors */
c = getopt_long(argc, argv, "h:i:cHf:", long_options, NULL); c = getopt_long(argc, argv, "h:i:cHf:", long_options, NULL);
if (c == -1) if (c == -1)
break; break;
switch (c) { switch (c) {
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'))
@@ -74,7 +74,7 @@ main(int argc, char *argv[])
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);
@@ -84,24 +84,24 @@ main(int argc, char *argv[])
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 'f': case 'f':
file = optarg; file = optarg;
break; break;
case 'c': case 'c':
clearImage = true; clearImage = true;
break; break;
case 'H': case 'H':
headerOnly = true; headerOnly = true;
break; break;
default: default:
print_usage(); print_usage();
} }
} }
if (file == NULL && optind == argc - 1) if (file == NULL && optind == argc - 1)
file = argv[optind]; file = argv[optind];
@@ -181,7 +181,7 @@ main(int argc, char *argv[])
header.doubleEndLineChar1 = '\r'; header.doubleEndLineChar1 = '\r';
header.doubleEndLineChar2 = '\n'; header.doubleEndLineChar2 = '\n';
strcat(desc, strcat(desc,
"# Disk Descriptor File\n" "# Disk Descriptor File\n"
"version=1\n" "version=1\n"
"CID=fffffffe\n" "CID=fffffffe\n"
@@ -191,7 +191,7 @@ main(int argc, char *argv[])
"# 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"
"ddb.virtualHWVersion = \"3\"\n" "ddb.virtualHWVersion = \"3\"\n"
@@ -200,7 +200,7 @@ main(int argc, char *argv[])
"ddb.geometry.heads = \"%llu\"\n" "ddb.geometry.heads = \"%llu\"\n"
"ddb.geometry.cylinders = \"%llu\"\n", "ddb.geometry.cylinders = \"%llu\"\n",
sectors, heads, cylinders); sectors, heads, cylinders);
int fd = open(file, O_RDWR | O_CREAT, 0666); int fd = open(file, O_RDWR | O_CREAT, 0666);
if (fd < 0) { if (fd < 0) {
fprintf(stderr, "Error: couldn't open file %s (%s)\n", file, fprintf(stderr, "Error: couldn't open file %s (%s)\n", file,
@@ -212,9 +212,8 @@ main(int argc, char *argv[])
if (sizeof(desc) != write(fd, desc, sizeof(desc))) if (sizeof(desc) != write(fd, desc, sizeof(desc)))
goto write_err; goto write_err;
headersize--; if (headersize - 1 != (uint64)lseek(fd, headersize - 1, SEEK_SET))
if (headersize != (uint64)lseek(fd, headersize, SEEK_SET))
goto write_err; goto write_err;
if (1 != write(fd, "", 1)) if (1 != write(fd, "", 1))
@@ -222,7 +221,7 @@ main(int argc, char *argv[])
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);