Macintosh-Tools/dingusppc
1
0
Fork 0
mirror of https://github.com/dingusdev/dingusppc.git synced 2025-01-11 05:29:43 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #124 from mihaip/upstream-empty-cdrom

Browse Source 
Make ImgFile ignore operations before the file is opened
This commit is contained in:
dingusdev 2024-11-25 18:35:31 -07:00 committed by GitHub
commit 1d807d10e9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
utils/CMakeLists.txt
View File

@ -1,7 +1,9 @@
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
include(PlatformGlob) include(PlatformGlob)
include_directories("${PROJECT_SOURCE_DIR}") include_directories("${PROJECT_SOURCE_DIR}"
"${PROJECT_SOURCE_DIR}/thirdparty/loguru/"
)
platform_glob(SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp") platform_glob(SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp")

17
utils/imgfile_sdl.cpp
View File

@ -20,6 +20,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
#include <utils/imgfile.h> #include <utils/imgfile.h>
#include <loguru.hpp>
#include <fstream> #include <fstream>
#include <sstream> #include <sstream>
@ -59,17 +60,29 @@ bool ImgFile::open(const std::string &img_path)
void ImgFile::close() void ImgFile::close()
{ {
if (!impl->stream) {
LOG_F(WARNING, "ImgFile::close before disk was opened, ignoring.");
return;
}
impl->stream.reset(); impl->stream.reset();
} }
uint64_t ImgFile::size() const uint64_t ImgFile::size() const
{ {
if (!impl->stream) {
LOG_F(WARNING, "ImgFile::size before disk was opened, ignoring.");
return 0;
}
impl->stream->seekg(0, impl->stream->end); impl->stream->seekg(0, impl->stream->end);
return impl->stream->tellg(); return impl->stream->tellg();
} }
uint64_t ImgFile::read(void* buf, uint64_t offset, uint64_t length) const uint64_t ImgFile::read(void* buf, uint64_t offset, uint64_t length) const
{ {
if (!impl->stream) {
LOG_F(WARNING, "ImgFile::read before disk was opened, ignoring.");
return 0;
}
impl->stream->seekg(offset, std::ios::beg); impl->stream->seekg(offset, std::ios::beg);
impl->stream->read((char *)buf, length); impl->stream->read((char *)buf, length);
return impl->stream->gcount(); return impl->stream->gcount();
@ -77,6 +90,10 @@ uint64_t ImgFile::read(void* buf, uint64_t offset, uint64_t length) const
uint64_t ImgFile::write(const void* buf, uint64_t offset, uint64_t length) uint64_t ImgFile::write(const void* buf, uint64_t offset, uint64_t length)
{ {
if (!impl->stream) {
LOG_F(WARNING, "ImgFile::write before disk was opened, ignoring.");
return 0;
}
impl->stream->seekg(offset, std::ios::beg); impl->stream->seekg(offset, std::ios::beg);
impl->stream->write((const char *)buf, length); impl->stream->write((const char *)buf, length);
#if defined(WIN32) || defined(__APPLE__) || defined(__linux) #if defined(WIN32) || defined(__APPLE__) || defined(__linux)