drinkingtea/ox
2
0
Fork 0
Code Issues Pull Requests Actions Releases Wiki Activity

Add a master Makefile with docker dev env support and address compiler warning that showed up in the Docker dev env

Browse Source
This commit is contained in:
Gary Talent
2016-12-22 20:57:57 -06:00
parent 02bbd75606
commit eeff110b31
5 changed files with 93 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ox/fs/oxfstool.cpp
+27 -25
View File
@@ -179,41 +179,43 @@ int write(int argc, char **args) {
if (fsFile) {
fseek(fsFile, 0, SEEK_END);
const auto fsSize = (::size_t) ftell(fsFile);
const auto fsSize = (size_t) ftell(fsFile);
rewind(fsFile);
auto fsBuff = (char*) malloc(fsSize);
fread(fsBuff, fsSize, 1, fsFile);
auto itemsRead = fread(fsBuff, fsSize, 1, fsFile);
fclose(fsFile);
auto srcBuff = loadFileBuff(srcPath, &srcSize);
if (srcBuff) {
auto fs = createFileSystem(fsBuff);
if (fs) {
err |= fs->write(inode, srcBuff, srcSize);
if (err) {
fprintf(stderr, "Could not write to file system.\n");
}
} else {
fprintf(stderr, "Invalid file system type: %d.\n", *(uint32_t*) fsBuff);
err = 1;
}
if (!err) {
fsFile = fopen(fsPath, "wb");
if (fsFile) {
err = fwrite(fsBuff, fsSize, 1, fsFile) != 1;
err |= fclose(fsFile);
if (itemsRead) {
auto srcBuff = loadFileBuff(srcPath, &srcSize);
if (srcBuff) {
auto fs = createFileSystem(fsBuff);
if (fs) {
err |= fs->write(inode, srcBuff, srcSize);
if (err) {
fprintf(stderr, "Could not write to file system file.\n");
fprintf(stderr, "Could not write to file system.\n");
}
} else {
fprintf(stderr, "Invalid file system type: %d.\n", *(uint32_t*) fsBuff);
err = 1;
}
if (!err) {
fsFile = fopen(fsPath, "wb");
if (fsFile) {
err = fwrite(fsBuff, fsSize, 1, fsFile) != 1;
err |= fclose(fsFile);
if (err) {
fprintf(stderr, "Could not write to file system file.\n");
}
} else {
err = 1;
}
}
} else {
err = 1;
fprintf(stderr, "Could not load source file.\n");
}
} else {
err = 1;
fprintf(stderr, "Could not load source file.\n");
}
free(fsBuff);