WallyHackenslacker/Aerofoil
1
0
Fork 0
mirror of https://github.com/elasota/Aerofoil.git synced 2025-09-23 14:53:52 +00:00
Code Issues Projects Releases Wiki Activity

File system refactor, bug fixes

Browse Source
This commit is contained in:
elasota
2021-03-07 04:24:13 -05:00
parent 6715bcb030
commit 3917e1a370
70 changed files with 2417 additions and 1242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
hqx2gp/hqx2gp.cpp
View File

@@ -23,10 +23,13 @@ SOFTWARE.
*/
#include "CFileStream.h"
#include "CombinedTimestamp.h"
#include "DeflateCodec.h"
#include "ScopedPtr.h"
#include "BinHex4.h"
#include "MacBinary2.h"
#include "MacFileMem.h"
#include "ZipFile.h"
#include <string>
@@ -68,19 +71,15 @@ int main(int argc, const char **argv)
return -1;
}
int64_t timestamp = 0;
PortabilityLayer::CombinedTimestamp ts;
{
uint8_t encodedTimestamp[8];
if (fread(encodedTimestamp, 1, 8, tsF) != 8)
if (fread(&ts, 1, sizeof(ts), tsF) != sizeof(ts))
{
fprintf(stderr, "Error reading timestamp file");
return -1;
}
for (int i = 0; i < 8; i++)
timestamp |= static_cast<int64_t>(encodedTimestamp[i]) << (i * 8);
}
fclose(tsF);
@@ -96,7 +95,7 @@ int main(int argc, const char **argv)
const char* extensions[] = { ".gpf", ".gpr", ".gpd", ".gpc" };
MacFileProperties mfp = memFile->FileInfo().m_properties;
mfp.m_creationDate = mfp.m_modifiedDate = timestamp;
mfp.m_createdTimeMacEpoch = mfp.m_modifiedTimeMacEpoch = ts.GetMacEpochTime();
MacFilePropertiesSerialized sp;
sp.Serialize(mfp);
@@ -142,8 +141,17 @@ int main(int argc, const char **argv)
if (!outF)
continue;
fwrite(bufferToWrite, 1, sizeToWrite, outF);
fclose(outF);
if (i == 0)
{
CFileStream stream(outF);
sp.WriteAsPackage(stream, ts);
stream.Close();
}
else
{
fwrite(bufferToWrite, 1, sizeToWrite, outF);
fclose(outF);
}
}
return 0;