Macintosh-Tools/Retro68
1
0
Fork 0
mirror of https://github.com/autc04/Retro68.git synced 2024-11-26 06:49:33 +00:00
Code Issues Projects Releases Wiki Activity

fix reading/writing of real resource files on the mac

Browse Source
This commit is contained in:
Wolfgang Thaller 2014-11-01 01:58:18 +01:00
parent a6d2873ed6
commit 5426b3a741
1 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
ResourceFiles/ResourceFile.cc
View File

@ -161,19 +161,36 @@ bool ResourceFile::read()
{ {
case Format::basilisk: case Format::basilisk:
{ {
fs::path rsrcPath = path.parent_path() / ".rsrc" / path.filename();
fs::path finfPath = path.parent_path() / ".finf" / path.filename();
fs::ifstream rsrcIn(rsrcPath);
resources.addResources(Resources(rsrcIn));
fs::ifstream finfIn(finfPath);
type = ostype(finfIn);
creator = ostype(finfIn);
fs::ifstream dataIn(path); fs::ifstream dataIn(path);
data = std::string(std::istreambuf_iterator<char>(dataIn), data = std::string(std::istreambuf_iterator<char>(dataIn),
std::istreambuf_iterator<char>()); std::istreambuf_iterator<char>());
fs::ifstream rsrcIn(path.parent_path() / ".rsrc" / path.filename());
resources.addResources(Resources(rsrcIn));
fs::ifstream finfIn(path.parent_path() / ".finf" / path.filename());
type = ostype(finfIn);
creator = ostype(finfIn);
} }
break; break;
#ifdef __APPLE__
case Format::real:
{
fs::ifstream dataIn(path);
data = std::string(std::istreambuf_iterator<char>(dataIn),
std::istreambuf_iterator<char>());
fs::ifstream rsrcIn(path / "..namedfork" / "rsrc");
resources.addResources(Resources(rsrcIn));
char finf[32];
int n = getxattr(path.c_str(), XATTR_FINDERINFO_NAME,
finf, 32, 0, 0);
std::istringstream finfIn(std::string(finf, finf+n));
type = ostype(finfIn);
creator = ostype(finfIn);
}
break;
#endif
default: default:
return false; return false;
} }
@ -202,7 +219,6 @@ bool ResourceFile::write()
ostype(finfOut, creator); ostype(finfOut, creator);
for(int i = 8; i < 32; i++) for(int i = 8; i < 32; i++)
byte(finfOut, 0); byte(finfOut, 0);
} }
break; break;
#ifdef __APPLE__ #ifdef __APPLE__
@ -213,7 +229,7 @@ bool ResourceFile::write()
std::ostringstream finfOut; std::ostringstream finfOut;
dataOut << data; dataOut << data;
rsrc.writeFork(rsrcOut); resources.writeFork(rsrcOut);
ostype(finfOut, type); ostype(finfOut, type);
ostype(finfOut, creator); ostype(finfOut, creator);