AxioDL
/
kabufuda
mirror of https://github.com/AxioDL/kabufuda.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix file copy operation

This commit is contained in:
Phillip Stephens 2016-12-23 02:08:44 -08:00
parent 8d2d1134ae
commit 31029767c8
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/kabufuda/Card.cpp
View File

@ -554,15 +554,15 @@ bool Card::copyFileTo(const std::unique_ptr<IFileHandle>& fh, Card& dest)
if (this == &dest) if (this == &dest)
return false; return false;
/* Check to make sure dest does not already contain fh */
if (dest._fileFromHandle(fh) != nullptr)
return false;
/* Now to add fh */ /* Now to add fh */
File* toCopy = _fileFromHandle(fh); File* toCopy = _fileFromHandle(fh);
if (!toCopy) if (!toCopy)
return false; return false;
/* Check to make sure dest does not already contain fh */
if (dest.openFile(toCopy->m_filename) != nullptr)
return false;
/* Try to allocate a new file */ /* Try to allocate a new file */
std::unique_ptr<IFileHandle> tmpHandle = dest.createFile(toCopy->m_filename, toCopy->m_blockCount * BlockSize); std::unique_ptr<IFileHandle> tmpHandle = dest.createFile(toCopy->m_filename, toCopy->m_blockCount * BlockSize);
if (!tmpHandle) if (!tmpHandle)
@ -647,13 +647,13 @@ const uint8_t* Card::getCurrentMaker() const
void Card::getSerial(uint64_t& serial) void Card::getSerial(uint64_t& serial)
{ {
Card copy = *this; _swapEndian();
copy._swapEndian();
uint32_t serialBuf[8]; uint32_t serialBuf[8];
for (uint32_t i = 0; i < 8; i++) for (uint32_t i = 0; i < 8; i++)
serialBuf[i] = SBig(*reinterpret_cast<uint32_t*>(copy.__raw + (i * 4))); serialBuf[i] = SBig(*reinterpret_cast<uint32_t*>(__raw + (i * 4)));
serial = uint64_t(serialBuf[0] ^ serialBuf[2] ^ serialBuf[4] ^ serialBuf[6]) << 32 | serial = uint64_t(serialBuf[0] ^ serialBuf[2] ^ serialBuf[4] ^ serialBuf[6]) << 32 |
(serialBuf[1] ^ serialBuf[3] ^ serialBuf[5] ^ serialBuf[7]); (serialBuf[1] ^ serialBuf[3] ^ serialBuf[5] ^ serialBuf[7]);
_swapEndian();
} }
void Card::getChecksum(uint16_t* checksum, uint16_t* inverse) void Card::getChecksum(uint16_t* checksum, uint16_t* inverse)