Merge recent updates but without broken builder and with minor refactoring and bugfixes

This commit is contained in:
vit9696 2018-10-08 12:58:12 +03:00
parent b064495db8
commit 0a634ebcbd
37 changed files with 712 additions and 8665 deletions

View file

@ -32,16 +32,10 @@ UEFIFind::~UEFIFind()
USTATUS UEFIFind::init(const UString & path)
{
USTATUS result;
if (!isExistOnFs(path))
return U_FILE_OPEN;
std::ifstream inputFile(path.toLocal8Bit(), std::ios::in | std::ios::binary);
if (!inputFile)
return U_FILE_OPEN;
std::vector<char> buffer(std::istreambuf_iterator<char>(inputFile),
(std::istreambuf_iterator<char>()));
inputFile.close();
UByteArray buffer;
result = readFileIntoBuffer(path, buffer);
if (result)
return result;
result = ffsParser->parse(buffer);
if (result)